From: Avi Kivity <a...@redhat.com>
Conflicts:
qemu/Makefile.target
qemu/hw/acpi.c
qemu/hw/device-hotplug.c
qemu/hw/ide.c
qemu/hw/lsi53c895a.c
qemu/hw/pc.c
qemu/hw/pc.h
qemu/hw/pci.c
qemu/hw/pci.h
qemu/hw/virtio-blk.c
qemu/hw/virtio-net.c
qemu/monitor.c
qemu/net.c
qemu/net.h
qemu/pc-bios/bios.bin
qemu/sysemu.h
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
