Merge branch 'next-samsung-devel' of git://git.kernel.org/pub/scm/linux/kernel/git...
Arnd Bergmann [Thu, 21 Jul 2011 14:34:00 +0000 (16:34 +0200)]
1  2 
arch/arm/Kconfig

Simple merge