From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 28 Jan 2010 21:59:58 +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.33-rc6~10^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b6c135ea9d563f77fe121deff6f19af222b3b0e;p=thirdparty%2Flinux.git

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

0b6c135ea9d563f77fe121deff6f19af222b3b0e