From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 5 Nov 2014 14:14:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/agraf/tags/signed-s390-for-upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3752ac89322d3351debf4bb87660606e137c839d;p=qemu.git

Merge remote-tracking branch 'remotes/agraf/tags/signed-s390-for-upstream' into staging

Patch queue for s390 - 2014-11-05

Two simple bug fixes to enable slightly newer guest kernels
and preliminary -M s390-ccw support for TCG (virtio doesn't work yet!)

# gpg: Signature made Wed 05 Nov 2014 11:01:55 GMT using RSA key ID 03FEDC60
# gpg: Good signature from "Alexander Graf <agraf@suse.de>"
# gpg:                 aka "Alexander Graf <alex@csgraf.de>"

* remotes/agraf/tags/signed-s390-for-upstream:
  s390x: Implement SAM{24,31,64}
  s390x: Fix sclp console input

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

3752ac89322d3351debf4bb87660606e137c839d