diff options
author | Peter Maydell | 2017-11-03 11:08:34 +0100 |
---|---|---|
committer | Peter Maydell | 2017-11-03 11:08:34 +0100 |
commit | b33afc415622e5eb26e0f14fd27eb86e32a5472e (patch) | |
tree | 40c762c91f9c13825eb88478b6dd65e6eb507a92 /hw/i386/pci-assign-load-rom.c | |
parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20171103' into staging (diff) | |
parent | docker: add python stdlib dependency (required by keycodemapdb) (diff) | |
download | qemu-b33afc415622e5eb26e0f14fd27eb86e32a5472e.tar.gz qemu-b33afc415622e5eb26e0f14fd27eb86e32a5472e.tar.xz qemu-b33afc415622e5eb26e0f14fd27eb86e32a5472e.zip |
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>
Diffstat (limited to 'hw/i386/pci-assign-load-rom.c')
0 files changed, 0 insertions, 0 deletions