From: Marcelo Tosatti <[email protected]> Conflicts: arch/ia64/kvm/kvm-ia64.c arch/powerpc/include/asm/kvm_host.h arch/x86/kvm/Makefile arch/x86/kvm/emulate.c arch/x86/kvm/i8254.c arch/x86/kvm/i8259.c arch/x86/kvm/lapic.c arch/x86/kvm/svm.c arch/x86/kvm/vmx.c arch/x86/kvm/x86.c include/linux/kvm_host.h virt/kvm/eventfd.c virt/kvm/ioapic.c virt/kvm/irq_comm.c virt/kvm/kvm_main.c
Signed-off-by: Marcelo Tosatti <[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
