Merge branch 'fb' into devel

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

Thu, 3 Jul 2008 15:13:28 +0000 (16:13 +0100)

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

Thu, 3 Jul 2008 15:13:28 +0000 (16:13 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 3 Jul 2008 15:13:28 +0000 (16:13 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Jul 2008 15:13:28 +0000 (16:13 +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>
	Thu, 3 Jul 2008 15:13:28 +0000 (16:13 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 3 Jul 2008 15:13:28 +0000 (16:13 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history