From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 30 Oct 2008 14:26:45 +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.28-rc3~33^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05cd2544f4b64d9a9eca0d170191867495e01feb;p=thirdparty%2Fkernel%2Flinux.git

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

05cd2544f4b64d9a9eca0d170191867495e01feb