]> 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, 20 Feb 2013 03:57:55 +0000 (14:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:58:01 +0000 (14:58 +1100)
commit56d3278ac004bf5762946f3a154f0e284ade6200
tree6798e1edd8e72324d49cf9d0379b73f700c13352
parent3e97a032868fd676e30a36f960d56aebbb82d830
parentcbd29cb6e38af6119df2cdac0c58acf0e85c177e
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/s390/include/asm/irq.h
arch/s390/kernel/irq.c
arch/x86/include/asm/vmx.h
include/uapi/linux/kvm.h
18 files changed:
Documentation/virtual/kvm/api.txt
arch/powerpc/include/asm/kvm_host.h
arch/powerpc/kvm/book3s_pr.c
arch/powerpc/kvm/emulate.c
arch/s390/include/asm/irq.h
arch/s390/kernel/irq.c
arch/s390/kvm/interrupt.c
arch/s390/kvm/kvm-s390.c
arch/x86/include/asm/kvm_para.h
arch/x86/include/asm/vmx.h
arch/x86/include/uapi/asm/vmx.h
arch/x86/kvm/x86.c
drivers/s390/kvm/kvm_virtio.c
drivers/s390/kvm/virtio_ccw.c
include/linux/kvm_host.h
include/uapi/linux/kvm.h
kernel/sched/core.c
virt/kvm/kvm_main.c