]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 04:23:17 +0000 (15:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 04:23:17 +0000 (15:23 +1100)
commitf011effcc0c9f644115c893244011d1f4b5f29c6
treeb4261b0b4d18867095ff07cb8fe79ee389cc63d2
parent0e08e4693f0fb4418564b4b7d1805e6ef111352a
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