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

Trivial merge