]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 14 Nov 2011 02:39:47 +0000 (13:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 14 Nov 2011 02:39:47 +0000 (13:39 +1100)
commitb4478a798b83bd743d051cfb33673212f3d6b406
tree9d91ce4170a9a115fbbe889e3742e308e010f97a
parentfd207a8889af6bc6f4ace49993a4e6d74798fa81
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