diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-15 10:47:00 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-15 10:47:00 -0500 |
commit | d4d7682484f339d70355b165a15f8f5e83638e40 (patch) | |
tree | 285ee8c912a0d7a461c38cd36ac37037f207a443 /hw/i386 | |
parent | 4f306496183d81aed4b43762cf3bfd6e054de767 (diff) | |
parent | 2362ecc5c6f4073f7f4c9c3f45c335aa8a2261bb (diff) | |
download | qemu-d4d7682484f339d70355b165a15f8f5e83638e40.zip qemu-d4d7682484f339d70355b165a15f8f5e83638e40.tar.gz qemu-d4d7682484f339d70355b165a15f8f5e83638e40.tar.bz2 |
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
Diffstat (limited to 'hw/i386')
0 files changed, 0 insertions, 0 deletions