]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bcm2835/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 03:19:39 +0000 (14:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 03:19:39 +0000 (14:19 +1100)
1  2 
arch/arm/Kconfig

Simple merge