Merge branch 'samsung/devel' into next/devel2
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 16:26:05 +0000 (18:26 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 16:26:05 +0000 (18:26 +0200)
1  2 
arch/arm/Kconfig

Simple merge