Commits

Merge branch 'cleanup-part-2' into devel-board Conflicts: arch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-rx51-peripherals.c
Merge branch 'cleanup-part-2' into devel-board Conflicts: arch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-rx51-peripherals.c