]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'xen-two/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Mar 2013 03:13:26 +0000 (14:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Mar 2013 03:13:26 +0000 (14:13 +1100)
1  2 
arch/x86/xen/Kconfig

Simple merge