Merge branch 'samsung/cleanup-plat-s5p' into next/soc2

author Arnd Bergmann <[email protected]>

Wed, 16 May 2012 13:53:15 +0000 (15:53 +0200)

committer Arnd Bergmann <[email protected]>

Wed, 16 May 2012 13:53:15 +0000 (15:53 +0200)
author Arnd Bergmann <[email protected]>
Wed, 16 May 2012 13:53:15 +0000 (15:53 +0200)
committer Arnd Bergmann <[email protected]>
Wed, 16 May 2012 13:53:15 +0000 (15:53 +0200)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
diff --cc arch/arm/plat-samsung/Kconfig
Simple merge
author	Arnd Bergmann <[email protected]>
	Wed, 16 May 2012 13:53:15 +0000 (15:53 +0200)
committer	Arnd Bergmann <[email protected]>
	Wed, 16 May 2012 13:53:15 +0000 (15:53 +0200)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history