]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 19 Aug 2013 23:32:03 +0000 (00:32 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 19 Aug 2013 23:32:03 +0000 (00:32 +0100)
1  2 
arch/arm/Kconfig

Simple merge