Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Russell King [Mon, 4 Jan 2010 15:51:38 +0000 (15:51 +0000)]

Trivial merge