Commits

Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel Conflicts: arch/arm/Kconfig arch/arm/Makefile
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel Conflicts: arch/arm/Kconfig arch/arm/Makefile