]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 02:15:00 +0000 (13:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 02:15:00 +0000 (13:15 +1100)
commitb56d0a333183574e0b8ae677d676e67ff7a695f8
tree55c4de58bdd6b6d43c74ad6de28570a9b9283482
parent19d22017a6c7086d2ec7dd493e51224ad0e64b67
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