Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Mon, 17 Aug 2009 17:16:28 +0000 (18:16 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Mon, 17 Aug 2009 17:16:28 +0000 (18:16 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 17 Aug 2009 17:16:28 +0000 (18:16 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 Aug 2009 17:16:28 +0000 (18:16 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Mon, 17 Aug 2009 17:16:28 +0000 (18:16 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 17 Aug 2009 17:16:28 +0000 (18:16 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history