From: Anthony Liguori Date: Mon, 1 Jul 2013 14:02:30 +0000 (-0500) Subject: Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f7d1f9d4e74d66cc7c72de46575a61bd6b433360;p=qemu.git Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging # By Cornelia Huck # Via Cornelia Huck * cohuck/virtio-ccw-upstr: virtio-ccw: fix build breakage on windows Message-id: 1372669523-4039-1-git-send-email-cornelia.huck@de.ibm.com Signed-off-by: Anthony Liguori --- f7d1f9d4e74d66cc7c72de46575a61bd6b433360