Merge git://git.marvell.com/orion into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 20 Dec 2008 17:40:03 +0000 (17:40 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 20 Dec 2008 17:40:03 +0000 (17:40 +0000)
1  2 
arch/arm/Kconfig

Simple merge