]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 01:02:25 +0000 (12:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 01:02:25 +0000 (12:02 +1100)
commit76529c3ac8a3ced398a8ef399364fe28a134cd89
tree2a51562dc96d7da1529ddbb8d3ea9e51baf6e6a5
parentde81a496771a8ef28749e8fff41487f884b6921f
parentec8161f0607c014eb27e65340edcda7edebb545a
Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
arch/x86/xen/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/microcode_core.c
arch/x86/xen/Kconfig