Merge branch 'for-rmk-rc' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 15 Aug 2009 11:42:46 +0000 (12:42 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 15 Aug 2009 11:42:46 +0000 (12:42 +0100)

Trivial merge