Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <[email protected]>
Thu, 12 Mar 2009 21:32:52 +0000 (21:32 +0000)
committerRussell King <[email protected]>
Thu, 12 Mar 2009 21:32:52 +0000 (21:32 +0000)

Trivial merge