diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-14 18:50:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-14 18:50:17 +0100 |
| commit | 661725da09f47eb92d356fac10a4cf3b7ad1f61d (patch) | |
| tree | 70d153c0860e0e84677d5e77be818351244bdd5f /migration/migration.c | |
| parent | f3947986d9bbbae1087c4c33880d3f8dbf1f1384 (diff) | |
| parent | 2af9170c8c269c4fba73e5271453ca15a57f5844 (diff) | |
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>
Diffstat (limited to 'migration/migration.c')
0 files changed, 0 insertions, 0 deletions