From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 28 Apr 2009 20:41:01 +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~14259^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=10993374f84cc1c4100aea9eca7fa154518ffc5e;p=firefly-linux-kernel-4.4.55.git

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

10993374f84cc1c4100aea9eca7fa154518ffc5e