Merge branch 's390-for-upstream' of git://github.com/agraf/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 9 Mar 2013 11:02:23 +0000 (11:02 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 9 Mar 2013 11:02:23 +0000 (11:02 +0000)
commiteb839909aa22069e04e1c910fcdf7feaa5581af6
treedbe8648a2a0d7568109ba143e51ed40185e6cdda
parent62e1aeaee4d0450222a0ea43c713b59526e3e0fe
parent8a7df84f9ff4342cae30f4e515e6ac82a0eb0bea
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