From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 22 Nov 2009 17:11:06 +0000 (+0000)
Subject: Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
X-Git-Tag: v2.6.32~36^2~3
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=c8a79c3da1ee5dcdbf6db829554fe3d9e68a88ab;p=net-next-2.6.git

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
---

c8a79c3da1ee5dcdbf6db829554fe3d9e68a88ab