From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 11 Feb 2011 22:56:19 +0000 (+0000)
Subject: Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux... 
X-Git-Tag: firefly_0821_release~7613^2~2443^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3329cba82248a5141f330b2526bd409c8993c4b;p=firefly-linux-kernel-4.4.55.git

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

e3329cba82248a5141f330b2526bd409c8993c4b