From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 3 Jan 2011 22:55:21 +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.37~3^2
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=04228460a3ded723b2da09141c76c45ddd712caf;p=cascardo%2Flinux.git

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

04228460a3ded723b2da09141c76c45ddd712caf