Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <[email protected]>
Thu, 4 Jun 2009 11:27:18 +0000 (12:27 +0100)
committerRussell King <[email protected]>
Thu, 4 Jun 2009 11:27:18 +0000 (12:27 +0100)

Trivial merge