Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Apr 2011 07:43:01 +0000 (08:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Apr 2011 07:43:01 +0000 (08:43 +0100)

Trivial merge