]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bcm2835/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Nov 2012 04:08:36 +0000 (15:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Nov 2012 04:08:36 +0000 (15:08 +1100)
1  2 
arch/arm/Kconfig

Simple merge