]> 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, 30 Nov 2011 03:16:48 +0000 (14:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 03:16:48 +0000 (14:16 +1100)
commitfda473c618d3d550a75dd3c9aee22fc7acd78dd5
tree79e36e9a32d29d2a47f1d176bf2d06eaa53eb522
parent9a19c64fd9a54a906bc5fd1c37ac06538631cd13
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