From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 14 Jul 2015 17:50:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150714' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=661725da09f47eb92d356fac10a4cf3b7ad1f61d;p=qemu.git

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150714' into staging

s390x fixes for 2.4:
- virtio migration regression
- missing diag288 watchdog resets

# gpg: Signature made Tue Jul 14 18:17:54 2015 BST using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"

* remotes/cohuck/tags/s390x-20150714:
  s390/virtio-ccw: Fix migration
  watchdog/diag288: correctly register for system reset requests

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

661725da09f47eb92d356fac10a4cf3b7ad1f61d