From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 22 Dec 2010 22:45:48 +0000 (+0000)
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~7613^2~3146^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=09c85a440d113a8e6f32bc616423d7684970c37c;p=firefly-linux-kernel-4.4.55.git

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

09c85a440d113a8e6f32bc616423d7684970c37c