diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-22 10:55:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-22 10:55:55 +0100 |
| commit | 3aaa8d4499de2a8d07ccc2c8e6e362479e1d433f (patch) | |
| tree | 94cdc6cd6ad6fb2b9c9a25b75095c8c5f454ded4 /include/hw/ide/internal.h | |
| parent | a43415ebfd2fc9bfc56d9b566707c9d465b0e17b (diff) | |
| parent | 3f2d07b3b01ea61126b382633ab4006320923048 (diff) | |
| download | focaccia-qemu-3aaa8d4499de2a8d07ccc2c8e6e362479e1d433f.tar.gz focaccia-qemu-3aaa8d4499de2a8d07ccc2c8e6e362479e1d433f.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170922' into staging
Fix an s390x migration breakage up for 2.10 stable. This will be fixed properly for 2.11. # gpg: Signature made Fri 22 Sep 2017 08:28:22 BST # gpg: using RSA key 0xDECF6B93C6F02FAF # gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" # gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" # gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>" # gpg: aka "Cornelia Huck <cohuck@kernel.org>" # gpg: aka "Cornelia Huck <cohuck@redhat.com>" # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF * remotes/cohuck/tags/s390x-20170922: s390x/ais: for 2.10 stable: disable ais facility Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/ide/internal.h')
0 files changed, 0 insertions, 0 deletions