From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 8 Jan 2010 16:18:37 +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-rc4~7^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0de9a00fd6e0a137c63fbbfb6012bf34cc0ab7c4;p=thirdparty%2Fkernel%2Flinux.git

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

0de9a00fd6e0a137c63fbbfb6012bf34cc0ab7c4