]> 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, 15 Nov 2011 01:27:10 +0000 (12:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 01:27:10 +0000 (12:27 +1100)
commitafc46f34f87ce004504b69f61c11cbf8b61f48fa
treeba78532d5ea04d824c4f09005b60bd43695338fd
parent1de0523155862ce944d7bbd116ad6d3dc56316a5
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