Merge branch 'imx-for-2.6.35' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <[email protected]>
Thu, 1 Jul 2010 10:01:33 +0000 (11:01 +0100)
committerRussell King <[email protected]>
Thu, 1 Jul 2010 10:01:33 +0000 (11:01 +0100)

Trivial merge