From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 28 Mar 2011 17:52:44 +0000 (+0100)
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~1725^2^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f183860d5007ec76ea36bfa6c36d66e37f0dbcf;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
---

5f183860d5007ec76ea36bfa6c36d66e37f0dbcf