Merge remote-tracking branch 'remotes/stsquad/tags/pull-ci-updates-for-softfreeze...
commitb33afc415622e5eb26e0f14fd27eb86e32a5472e
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 3 Nov 2017 10:08:34 +0000 (3 10:08 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 3 Nov 2017 10:08:34 +0000 (3 10:08 +0000)
tree40c762c91f9c13825eb88478b6dd65e6eb507a92
parent9c4da1fa2b667aa50c0db9557fa04593bef54a76
parente58c1f9b35e81dec90c3d483b57351256cecfc41
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>