Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
commit38c4718392fda2bda1e084366b9aa41b49b9d8cf
authorAurelien Jarno <aurelien@aurel32.net>
Mon, 29 Oct 2012 23:35:43 +0000 (30 00:35 +0100)
committerAurelien Jarno <aurelien@aurel32.net>
Mon, 29 Oct 2012 23:35:43 +0000 (30 00:35 +0100)
tree881cb519ffcebc0b458bcbb92338297da19cb914
parent3585317f6fdff0e3ae082f88afb2784d815a07e2
parent130c57c036fdc2eba8936da1b1dad39e78d5ea32
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf

* 's390-for-upstream' of git://repo.or.cz/qemu/agraf:
  s390: sclp ascii console support
  s390: sclp signal quiesce support
  s390: sclp event support
  s390: sclp base support
  s390: use sync regs for register transfer
  s390/kvm_stat: correct sys_perf_event_open syscall number
  s390x: fix -initrd in virtio machine