Merge branch 'shmobile' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 31 Jul 2010 13:19:22 +0000 (14:19 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 31 Jul 2010 13:19:22 +0000 (14:19 +0100)
1  2 
arch/arm/Kconfig

Simple merge