]> 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, 21 Dec 2011 04:34:25 +0000 (15:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:34:25 +0000 (15:34 +1100)
commit19bdaf0899c0ea7932d485c4e48240af4d44a25d
treeb34fb68e1e1ba8c155e7942c3644106b8380533e
parentc96b844b55a525cb6dee711aa0523a49b716a282
parentec8161f0607c014eb27e65340edcda7edebb545a
Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
arch/x86/xen/Kconfig
arch/x86/include/asm/microcode.h
arch/x86/kernel/Makefile
arch/x86/kernel/microcode_core.c
arch/x86/xen/Kconfig