From: Avi Kivity <[EMAIL PROTECTED]>
Reconcile minor differences between 2.6.25 patchqueue and kvm.git master.
Conflicts:
arch/x86/kvm/x86_emulate.c
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
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
