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)
commit112243034cec7c3ef0499fdebf39218714da453d
treef6469eaab26ea2e985da32b5cc297ddb9c64f952
parent773e9610a7bd44720b8b625d01997b2953edc2db
parentee569c43e340202fb0ba427c57b77568a32b9a3a
Merge branch 'clks' into devel
arch/arm/Kconfig
drivers/video/amba-clcd.c