[PATCH] Merge branch 'qemu-cvs'

[Avi Kivity]

From: Avi Kivity <[EMAIL PROTECTED]>

Conflicts:
        qemu/hw/pc.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