diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-09 16:12:34 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-09 16:12:34 +0000 |
commit | c7b02d7d032d6022060e4b393827c963c93ce63f (patch) | |
tree | ecf947ce6293e4372ad96dbc2501f9b72996d90b /device-hotplug.c | |
parent | 7e0019a7196ebed177c95824875cf852e1a6f667 (diff) | |
parent | 04200a1674bfc20784f1fc105cbc22bd9be779e8 (diff) | |
download | qemu-c7b02d7d032d6022060e4b393827c963c93ce63f.zip |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-speedup-090218-1' into staging
One patch to mitigate Travis timeouts
# gpg: Signature made Fri 09 Feb 2018 14:13:46 GMT
# gpg: using RSA key FBD0DB095A9E2A44
# 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-travis-speedup-090218-1:
.travis.yml: add --disable-linux-user for some jobs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'device-hotplug.c')
0 files changed, 0 insertions, 0 deletions