From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 13 Apr 2011 22:32:13 +0000 (+0100)
Subject: Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux... 
X-Git-Tag: v2.6.39-rc4~20^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5;p=thirdparty%2Fkernel%2Flinux.git

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

a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5