From: Avi Kivity <[email protected]>

Conflicts:
        Documentation/kvm/api.txt
        arch/x86/include/asm/kvm.h
        arch/x86/include/asm/vmx.h
        arch/x86/kvm/svm.c
        arch/x86/kvm/vmx.c
        arch/x86/kvm/x86.c
        include/linux/kvm.h
        virt/kvm/assigned-dev.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

Reply via email to