]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 02:50:59 +0000 (13:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 02:50:59 +0000 (13:50 +1100)
commitfd0254178eae520cf7ededc6bf9f99d642560aad
tree00c9e69dae75737627b1d85e59596ed57e2205ec
parentd453ac1f3983d1c0d2c025f0e98d30ce2454eb1f
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