Merge branch 'cleanup-part-2' into devel-board
authorTony Lindgren <tony@atomide.com>
Sun, 10 Jul 2011 18:48:26 +0000 (11:48 -0700)
committerTony Lindgren <tony@atomide.com>
Sun, 10 Jul 2011 18:48:26 +0000 (11:48 -0700)
commit1ad920556f32a5a127397ca461d1a1faaf22c4e0
treecea7ef733c50025496f554f114173e49e52d3028
parentf67df6c670a8fcd3f63728afa2314e7eca653bd7
parent727e18b429e3badda12d1de74f492bfa363a2e94
Merge branch 'cleanup-part-2' into devel-board

Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rx51-peripherals.c