]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'apm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:08:51 +0000 (13:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:08:51 +0000 (13:08 +1100)
1  2 
arch/x86/Kconfig

Simple merge