]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 15 Mar 2013 15:47:00 +0000 (10:47 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 15 Mar 2013 15:47:00 +0000 (10:47 -0500)
commitd4d7682484f339d70355b165a15f8f5e83638e40
tree285ee8c912a0d7a461c38cd36ac37037f207a443
parent4f306496183d81aed4b43762cf3bfd6e054de767
parent2362ecc5c6f4073f7f4c9c3f45c335aa8a2261bb
Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging

# By Christian Borntraeger (1) and Cornelia Huck (1)
# Via Cornelia Huck
* cohuck/virtio-ccw-upstr:
  virtio-ccw: Wire up virtio-rng.
  virtio-ccw: remove qdev_unparent in unplug routing