[PATCH] Merge branch 'qemu-cvs'

[Avi Kivity]

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

Conflicts:
        qemu/net.c
        qemu/net.h
        qemu/qemu-doc.texi
        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