Commits
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable Conflicts: arch/arm/mach-imx/mach-cpuimx27.c
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable Conflicts: arch/arm/mach-imx/mach-cpuimx27.c