]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 05:29:48 +0000 (16:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 05:29:48 +0000 (16:29 +1100)
commitd173975e6882e86a9c12c256d948c86911ec0eda
treece205f6a611ce64ca2c64201a0b486287cd6de2c
parent79441b4fc88bfdd97f93a26d1e005458034f1937
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