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

Simple merge