]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 05:20:32 +0000 (16:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 05:20:32 +0000 (16:20 +1100)
commit8411cf632e0b10402e7665cf0c66a61c7a94e458
treeb1276c41af03e34a0820b79fc504dc8b42241720
parent5af83a0aee16cd078c2093a27ddb51e6cd656848
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