summary refs log tree commit diff stats
path: root/hw/display
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-02-10 15:05:36 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-02-10 15:05:37 +0000
commit33d076ebd05491d9f7cace682b4ed70c33263f12 (patch)
tree37485c146ce007fed181257f16f14ac073cd6103 /hw/display
parent8b1897725d07c02a55c06e1c1a885c5c17f15b0f (diff)
parent78a22af040b8ea7c26d52755facdc332ac7bac46 (diff)
downloadfocaccia-qemu-33d076ebd05491d9f7cace682b4ed70c33263f12.tar.gz
focaccia-qemu-33d076ebd05491d9f7cace682b4ed70c33263f12.zip
Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-10022017-1' into staging
One minor fix and a build split to reduce timeouts.

# gpg: Signature made Fri 10 Feb 2017 14:46:52 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-travis-10022017-1:
  .travis.yml: split VM based builds
  .travis.yml: don't specify CONFIG twice

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display')
0 files changed, 0 insertions, 0 deletions