From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 23 Mar 2010 08:18:25 +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~9833^2~2488^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4f4669ee732a6b37279e912af1833fbff15407a2;p=firefly-linux-kernel-4.4.55.git

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

4f4669ee732a6b37279e912af1833fbff15407a2