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

Conflicts:
        qemu/Makefile
        qemu/Makefile.target
        qemu/block-raw-posix.c
        qemu/configure
        qemu/cutils.c
        qemu/dyngen.c
        qemu/hw/cirrus_vga.c
        qemu/hw/e1000.c
        qemu/hw/pci.c
        qemu/hw/vga.c
        qemu/osdep.c
        qemu/pc-bios/Makefile
        qemu/qemu-common.h
        qemu/target-ppc/helper.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

Reply via email to