]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 1 Jul 2013 14:02:30 +0000 (09:02 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 1 Jul 2013 14:02:31 +0000 (09:02 -0500)
commitf7d1f9d4e74d66cc7c72de46575a61bd6b433360
treedf6d3ee4c9c499b195a2500283c7d43cfbbfef3b
parentd75416ef29e477ebeadf9da41677be6f8166e8be
parentcc3ac9c4a6fd0574b767c599e4a582be8f23260d
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 <aliguori@us.ibm.com>