Merge branch 'clks' into devel

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

Sun, 30 Nov 2008 17:46:52 +0000 (17:46 +0000)

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

Sun, 30 Nov 2008 17:46:52 +0000 (17:46 +0000)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 30 Nov 2008 17:46:52 +0000 (17:46 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 30 Nov 2008 17:46:52 +0000 (17:46 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/video/amba-clcd.c
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Sun, 30 Nov 2008 17:46:52 +0000 (17:46 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 30 Nov 2008 17:46:52 +0000 (17:46 +0000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/amba-clcd.c	patch \|	diff1 \|	diff2 \|	blob \| history