]> git.proxmox.com Git - qemu.git/commitdiff
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)
# 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>

Trivial merge