]> 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, 29 Nov 2011 02:33:46 +0000 (13:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:33:46 +0000 (13:33 +1100)
commite96b16277c8434a44b0b1755f15ebf4b90fc54cd
tree399fed797804e3580de96bfdb494c00663e50f59
parent9296d42fff7f1800f646f813b38f544b5dc9acb2
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