Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 13 Sep 2008 19:10:59 +0000 (20:10 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 13 Sep 2008 19:11:15 +0000 (20:11 +0100)

Trivial merge