From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 15 Mar 2013 15:47:00 +0000 (-0500)
Subject: Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging
X-Git-Tag: v1.5.0-rc0~468
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4d7682484f339d70355b165a15f8f5e83638e40;p=thirdparty%2Fqemu.git

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
---

d4d7682484f339d70355b165a15f8f5e83638e40