Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 May 2010 21:37:06 +0000 (22:37 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 May 2010 21:37:06 +0000 (22:37 +0100)
1  2 
arch/arm/Kconfig

Simple merge