Merge branch 'next-samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel...
Arnd Bergmann [Thu, 21 Jul 2011 14:31:22 +0000 (16:31 +0200)]
1  2 
arch/arm/Kconfig
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap2/board-rx51-peripherals.c

Simple merge
Simple merge