]> 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, 14 Dec 2011 04:05:48 +0000 (15:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 04:05:48 +0000 (15:05 +1100)
commitffea3cdc09b28248e0d89659d5cb0cc11b16b69b
tree79d8df5439dad8f197dab8403dee01d72d4cf06e
parentdb58fc7396226c8a9179f1a6bc6201411a0cf001
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