From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 9 Mar 2013 11:02:23 +0000 (+0000)
Subject: Merge branch 's390-for-upstream' of git://github.com/agraf/qemu
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~925^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=eb839909aa22069e04e1c910fcdf7feaa5581af6;p=qemu-upstream-4.4-testing.git

Merge branch 's390-for-upstream' of git://github.com/agraf/qemu

* 's390-for-upstream' of git://github.com/agraf/qemu:
  s390/virtio-ccw: remove redundant call to blockdev_mark_auto_del
  s390/css: Fix subchannel detection
  Allow virtio-net features for legacy s390 virtio bus
  s390: virtio-ccw maintainer
  s390: simplify kvm cpu init
---

eb839909aa22069e04e1c910fcdf7feaa5581af6