From: Avi Kivity <a...@redhat.com>

Conflicts:
        Documentation/kvm/api.txt
        Documentation/kvm/cpuid.txt
        Documentation/kvm/mmu.txt
        arch/powerpc/kvm/book3s.c
        arch/powerpc/kvm/booke.c
        arch/x86/include/asm/kvm_emulate.h
        arch/x86/include/asm/kvm_host.h
        arch/x86/kvm/emulate.c
        arch/x86/kvm/mmu.c
        arch/x86/kvm/paging_tmpl.h
        arch/x86/kvm/svm.c
        arch/x86/kvm/vmx.c
        arch/x86/kvm/x86.c

Signed-off-by: Avi Kivity <a...@redhat.com>
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to