From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 8 Jul 2014 14:10:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140708' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~320
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d614cb68dacca24eb003825144d5a55d8f459a13;p=qemu-upstream-4.6-testing.git

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

Bugfixes for s390x: set subsystem id in the lowcore when booting from the
s390-ccw bios, and set the channel-program address after I/O completion,
when applicable.

# gpg: Signature made Tue 08 Jul 2014 14:18:20 BST using RSA key ID C6F02FAF
# gpg: Can't check signature: public key not found

* remotes/cohuck/tags/s390x-20140708:
  s390x/css: reflect cpa in scsw
  pc-bios/s390-ccw: update binary
  pc-bios/s390-ccw: store proper subsystem information word

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

d614cb68dacca24eb003825144d5a55d8f459a13