From: Peter Maydell Date: Wed, 20 Jul 2016 19:59:05 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160720' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3b55fbdcb048bf82e82c29b555d0918b83fc40a5;p=qemu.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160720' into staging Fixes for s390x in the css area. # gpg: Signature made Wed 20 Jul 2016 15:12:43 BST # gpg: using RSA key 0xDECF6B93C6F02FAF # gpg: Good signature from "Cornelia Huck " # gpg: aka "Cornelia Huck " # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF * remotes/cohuck/tags/s390x-20160720: s390x/css: provide a dev_path for css devices s390x/css: sch_handle_start_func() handles resume, too s390x/css: copy CCW format bit from ORB to SCSW Signed-off-by: Peter Maydell --- 3b55fbdcb048bf82e82c29b555d0918b83fc40a5