Merge branch 'imx-for-2.6.35' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Jul 2010 10:01:33 +0000 (11:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Jul 2010 10:01:33 +0000 (11:01 +0100)

Trivial merge