From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 3 Nov 2017 10:08:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stsquad/tags/pull-ci-updates-for-softfreeze... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b33afc415622e5eb26e0f14fd27eb86e32a5472e;p=qemu.git

Merge remote-tracking branch 'remotes/stsquad/tags/pull-ci-updates-for-softfreeze-021117-2' into staging

One fix for win32/64 cross compiles.

# gpg: Signature made Thu 02 Nov 2017 11:55:46 GMT
# gpg:                using RSA key 0xFBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-ci-updates-for-softfreeze-021117-2:
  docker: add python stdlib dependency (required by keycodemapdb)

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

b33afc415622e5eb26e0f14fd27eb86e32a5472e