Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 25 May 2011 23:41:21 +0000 (00:41 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 25 May 2011 23:41:21 +0000 (00:41 +0100)
1  2 
arch/arm/Kconfig

Simple merge