From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 1 Jul 2010 09:16:00 +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~1441^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5;p=firefly-linux-kernel-4.4.55.git

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

fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5