From: Avi Kivity <a...@redhat.com>

Conflicts:
        qemu/Makefile
        qemu/hw/mips_malta.c
        qemu/hw/pc.c
        qemu/hw/pci.c
        qemu/hw/pci.h
        qemu/hw/ppc_chrp.c
        qemu/hw/ppc_prep.c
        qemu/hw/realview.c
        qemu/hw/sun4u.c
        qemu/hw/versatilepb.c
        qemu/hw/virtio-net.c
        qemu/monitor.c
        qemu/net.c
        qemu/net.h
        qemu/pc-bios/bios.bin

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

Reply via email to