]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 05:28:38 +0000 (15:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 05:28:38 +0000 (15:28 +1000)
commit4b50fb4af752b59fe012f274a75368e7254d5c37
treeaf1162228d152281a400d6df65805ac906fdf1ab
parentec45bb56ba46af9164c8a8124befd76d7d5b812b
parent1e08ec4a130e2745d96df169e67c58df98a07311
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/s390/include/asm/processor.h
arch/x86/kvm/i8259.c
13 files changed:
arch/s390/include/asm/processor.h
arch/s390/kernel/dis.c
arch/s390/kvm/Kconfig
arch/s390/kvm/priv.c
arch/x86/Kconfig
arch/x86/include/asm/kvm.h
arch/x86/include/asm/kvm_host.h
arch/x86/kernel/Makefile
arch/x86/kernel/setup.c
arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c
include/linux/kvm_host.h
virt/kvm/kvm_main.c