From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 8 Sep 2009 10:23:24 +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-rc1~691^2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5eb38f44839ec1aade167b125d86d265c886c195;p=thirdparty%2Fkernel%2Flinux.git

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

5eb38f44839ec1aade167b125d86d265c886c195