Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Russell King [Mon, 1 Feb 2010 20:06:40 +0000 (20:06 +0000)]

Trivial merge