From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 1 May 2012 23:46:39 +0000 (-0500)
Subject: Merge remote-tracking branch 'agraf/s390-for-upstream' into staging
X-Git-Tag: pull-nvme-20200902~8100
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=174210fe70d34a1ac70b98c1e4412934cbee2061;p=qemu-nvme.git

Merge remote-tracking branch 'agraf/s390-for-upstream' into staging

* agraf/s390-for-upstream:
  s390: reset avail and used index on reboot
  S390: dont call system_shutdown on disabled wait
  S390: remove default cdrom, sd-card and floppy support
  S390: support reboot for kvm on s390
  S390: reboot: reset device pages on reboot
  S390: fix error handling on kernel and initrd failures
  S390: fix kernel_commandline handling
---

174210fe70d34a1ac70b98c1e4412934cbee2061