Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 20 May 2011 09:38:27 +0000 (10:38 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 20 May 2011 09:38:27 +0000 (10:38 +0100)

Trivial merge