Merge branch 'for-rmk-next' of git://git.pengutronix.de/git/imx/linux-2.6 into devel...
authorRussell King <[email protected]>
Mon, 11 Oct 2010 16:30:44 +0000 (17:30 +0100)
committerRussell King <[email protected]>
Mon, 11 Oct 2010 16:30:44 +0000 (17:30 +0100)

Trivial merge