Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 28 Mar 2009 14:18:11 +0000 (14:18 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 28 Mar 2009 14:18:11 +0000 (14:18 +0000)

Trivial merge