]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f30649 2362ecc)
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)
# 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


Trivial merge
Qemu copy for testing