Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes