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

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

Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)

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

Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history