Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 25 May 2011 20:47:48 +0000 (21:47 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 25 May 2011 20:47:48 +0000 (21:47 +0100)
commit586893ebc42943008010b4c210cfc9167df615e5
treeeec3179235978fba9ca6bfae0799d97c8532ee15
parent014322dac6ae0048c928c6ca2faf0d53194f9d15
parentbd6356bdafc853201168f718f0059fbe11191461
Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/mach-nuri.c
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/Makefile
arch/arm/mach-exynos4/mach-nuri.c
arch/arm/plat-s5p/Kconfig
arch/arm/plat-samsung/include/plat/cpu.h
arch/arm/plat-samsung/include/plat/devs.h
sound/soc/samsung/Kconfig