summary refs log tree commit diff stats
path: root/scripts/qemu.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-09-27 15:59:35 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-09-27 15:59:35 +0100
commitd666cacaeab904fb6e8361ee791b6e8ab8448577 (patch)
treed2e4e678498bf5993d91424630be5997c799ef22 /scripts/qemu.py
parent08df7e5577e4b926822032e218ef6ef478ab7aca (diff)
parent9dacc908462693719d84ec594e839434959cf6f1 (diff)
downloadfocaccia-qemu-d666cacaeab904fb6e8361ee791b6e8ab8448577.tar.gz
focaccia-qemu-d666cacaeab904fb6e8361ee791b6e8ab8448577.zip
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170927' into staging
Another s390x compat fix that should make it into 2.10.1.

# gpg: Signature made Wed 27 Sep 2017 10:30:16 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-20170927:
  s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qemu.py')
0 files changed, 0 insertions, 0 deletions