summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-03-15 14:48:09 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-03-15 14:48:09 +0000
commit56e8698ffa8aba9f762f980bc21b5340b006f24b (patch)
treec24a274b079d18a9a0c9d950672fc6190aed260b /hw
parent6265e23b1ce5b1cda5792a19bcb801a1928911b0 (diff)
parent0b438fa627ca192e4be2c527bf188706d64bdd0d (diff)
downloadqemu-56e8698ffa8aba9f762f980bc21b5340b006f24b.tar.gz
Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-speedup-130318-1' into staging
Some updates to reduce timeouts in Travis # gpg: Signature made Tue 13 Mar 2018 16:44: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-130318-1: .travis.yml: add --disable-user with the rest of the disables .travis.yml: split default config into system and user .travis.yml: drop setting default log output Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
0 files changed, 0 insertions, 0 deletions