Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 28 Jul 2008 17:45:57 +0000 (18:45 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 28 Jul 2008 17:45:57 +0000 (18:45 +0100)

Trivial merge