tree 285ee8c912a0d7a461c38cd36ac37037f207a443
parent 4f306496183d81aed4b43762cf3bfd6e054de767
parent 2362ecc5c6f4073f7f4c9c3f45c335aa8a2261bb
author Anthony Liguori <aliguori@us.ibm.com> 1363362420 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1363362420 -0500

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