Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 1 Sep 2010 09:08:50 +0000 (10:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 1 Sep 2010 09:08:50 +0000 (10:08 +0100)

Trivial merge