Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 4 Jun 2009 11:27:18 +0000 (12:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Jun 2009 11:27:18 +0000 (12:27 +0100)

Trivial merge