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)
commit5ddac6bc1c4bfcbf645d18668a5033ca257a8ea7
treea8a74ef15a3622ecc3ab94a424321de8b111648b
parentc33d4326b60a3aea5cd070a365043f488f81a3b0
parent89e1c3d0fffa0d610fa7292bbfafb5e87dc6be34
Merge branch 'next-samsung-board' of git://git./linux/kernel/git/kgene/linux-samsung into next/board
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap2/board-rx51-peripherals.c