From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 23 Mar 2017 14:51:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170323' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=21c84c91f726054672e187112b698aa3d5e181f4;p=qemu.git

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

Fix linux-user vs. cpu models.

# gpg: Signature made Thu 23 Mar 2017 09:56:13 GMT
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20170323:
  target/s390x: Fix broken user mode

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

21c84c91f726054672e187112b698aa3d5e181f4