[qemu-xen master] Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200717' into staging

[patchbot@xxxxxxx]

commit 97f750becac33e3d3e446d3ff4ae9af2577b7877
Merge: 920d213cb22a4b8d1a7c941da1955b45c5fd9a09 
9ece07d7a3941eeb845a6f000a191bba19557231
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Sat Jul 18 17:27:34 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Sat Jul 18 17:27:34 2020 +0100

    Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200717' into 
staging
    
    Fix typo in newly added documentation.
    
    # gpg: Signature made Fri 17 Jul 2020 14:54:20 BST
    # gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
    # gpg:                issuer "cohuck@xxxxxxxxxx"
    # gpg: Good signature from "Cornelia Huck <conny@xxxxxxxxxxxxxxxx>" 
[marginal]
    # gpg:                 aka "Cornelia Huck <huckc@xxxxxxxxxxxxxxxxxx>" [full]
    # gpg:                 aka "Cornelia Huck <cornelia.huck@xxxxxxxxxx>" [full]
    # gpg:                 aka "Cornelia Huck <cohuck@xxxxxxxxxx>" [marginal]
    # gpg:                 aka "Cornelia Huck <cohuck@xxxxxxxxxx>" [marginal]
    # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 
2FAF
    
    * remotes/cohuck/tags/s390x-20200717:
      docs/s390x: fix vfio-ccw type
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 docs/system/s390x/vfio-ccw.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master