From: Avi Kivity <[email protected]> Conflicts: arch/ia64/include/asm/kvm_host.h arch/ia64/kvm/kvm-ia64.c arch/s390/kvm/intercept.c arch/s390/kvm/kvm-s390.c arch/s390/kvm/sigp.c arch/x86/include/asm/kvm.h arch/x86/include/asm/kvm_host.h arch/x86/kvm/Makefile arch/x86/kvm/i8254.c arch/x86/kvm/kvm_timer.h arch/x86/kvm/lapic.c arch/x86/kvm/mmu.c arch/x86/kvm/mmu.h arch/x86/kvm/paging_tmpl.h arch/x86/kvm/svm.c arch/x86/kvm/timer.c arch/x86/kvm/vmx.c arch/x86/kvm/x86.c arch/x86/kvm/x86_emulate.c include/linux/kvm.h virt/kvm/ioapic.c virt/kvm/irq_comm.c virt/kvm/kvm_main.c
Signed-off-by: Avi Kivity <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
