From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 17 Oct 2009 15:29:01 +0000 (+0100)
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-rc6~54^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50ad5f591bf0d2c877cb3689be01bea9eefdeb2b;p=thirdparty%2Fkernel%2Flinux.git

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

50ad5f591bf0d2c877cb3689be01bea9eefdeb2b