From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 5 Jan 2011 10:23:38 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
X-Git-Tag: firefly_0821_release~7613^2~3117^2^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1051b9f0f9eab8091fe3bf98320741adf36b4cfa;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
---

1051b9f0f9eab8091fe3bf98320741adf36b4cfa