From: Avi Kivity <[EMAIL PROTECTED]>

Conflicts:

        arch/x86/Kconfig
        arch/x86/Makefile
        arch/x86/kvm/Kconfig
        arch/x86/kvm/mmu.c
        arch/x86/kvm/paging_tmpl.h
        arch/x86/kvm/svm.c
        arch/x86/kvm/vmx.c
        arch/x86/kvm/vmx.h
        arch/x86/kvm/x86.c
        arch/x86/kvm/x86_emulate.c
        include/asm-x86/kvm_host.h
        include/linux/Kbuild
        include/linux/kvm_host.h
        virt/kvm/kvm_main.c

Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits

Reply via email to