]> 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, 12 Dec 2011 03:04:07 +0000 (14:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 03:04:07 +0000 (14:04 +1100)
commitad9b4293f1d75960e9f5b210b5108d975b391342
tree4679c59d926ccf587a9573970c2aa695cdbc16e7
parent71c32f13c28cfcb39af6316b4b8447c9bd7c75eb
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