From: Avi Kivity <a...@redhat.com> Conflicts: qemu/Makefile.target qemu/hw/cirrus_vga.c qemu/hw/ide.c qemu/pc-bios/bios.bin qemu/vl.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