]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'fixes' and 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 13 Dec 2011 08:52:34 +0000 (08:52 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 13 Dec 2011 08:52:34 +0000 (08:52 +0000)
1  2 
arch/arm/Kconfig

Simple merge