]> 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, 7 Nov 2011 01:47:41 +0000 (12:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 01:47:41 +0000 (12:47 +1100)
commit7fa7953a4026da147cd6fabb3f5c2af23e48dce6
treeeb3eee86fd0e1699f534629ede201df311ee70f1
parent4c7caf2334b37109f041ffba15062a35b11360a7
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