Merge branch 'clks' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 30 Nov 2008 17:46:52 +0000 (17:46 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 30 Nov 2008 17:46:52 +0000 (17:46 +0000)
1  2 
arch/arm/Kconfig
drivers/video/amba-clcd.c

Simple merge
Simple merge