From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 1 Sep 2010 09:06:27 +0000 (+0100)
Subject: Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
X-Git-Tag: firefly_0821_release~9833^2~590^2~9
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1fd317076caf1ee22ddb6a7853a0ca462f0233c5;p=firefly-linux-kernel-4.4.55.git

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

1fd317076caf1ee22ddb6a7853a0ca462f0233c5