From: Avi Kivity <[EMAIL PROTECTED]> Conflicts: qemu/Makefile.target qemu/configure qemu/cutils.c qemu/hw/pc.c qemu/hw/ppc4xx.h qemu/hw/virtio-balloon.c qemu/hw/virtio-blk.c qemu/hw/virtio.c qemu/hw/virtio.h qemu/monitor.c qemu/qemu-common.h qemu/vl.c
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]> -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html