From: Avi Kivity <[EMAIL PROTECTED]>

Conflicts:

        arch/powerpc/kvm/Kconfig
        arch/s390/kvm/kvm-s390.c
        include/asm-powerpc/kvm_para.h
        include/asm-s390/kvm.h

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

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits

Reply via email to