Merge branch 'next-samsung-board' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 21 Jul 2011 14:32:06 +0000 (16:32 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 21 Jul 2011 14:32:06 +0000 (16:32 +0200)
1  2 
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap2/board-rx51-peripherals.c

Simple merge