]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Nov 2011 06:21:20 +0000 (17:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Nov 2011 06:21:20 +0000 (17:21 +1100)
commit857c2ebb35684b32591f9540c78de0b295f6c183
treefabaec9588a0ecf9012a6d4c870f705b5cc95054
parent3ecd864f06efd8f7cea29be2e79ba09a339dc59f
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
arch/x86/xen/time.c