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)
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-rx51-peripherals.c


Trivial merge