diff options
| author | Peter Maydell | 2016-06-21 16:19:58 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-21 16:19:58 +0200 |
| commit | 6f1d2d1c5ad20d464705b17318cb7ca495f8078a (patch) | |
| tree | 24229462ca803ce82f14ed8c2824f542348b1173 /hw/usb/dev-storage.c | |
| parent | milkymist: fix tmu2.c build failure (missing error.h include) (diff) | |
| parent | .travis.yml: disable Sparse testing (diff) | |
| download | qemu-6f1d2d1c5ad20d464705b17318cb7ca495f8078a.tar.gz qemu-6f1d2d1c5ad20d464705b17318cb7ca495f8078a.tar.xz qemu-6f1d2d1c5ad20d464705b17318cb7ca495f8078a.zip | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-20160621-1' into staging
This pull request contains:
- disable sparse testing
- add trusty build target
- add libnfs-dev for NFS block driver
These are the same patches posted last week for any last minute review.
# gpg: Signature made Tue 21 Jun 2016 10:06:34 BST
# 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-20160621-1:
.travis.yml: disable Sparse testing
.travis.yml: add trusty GCE target
.travis.yml: add libnfs-dev for NFS block driver
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/dev-storage.c')
0 files changed, 0 insertions, 0 deletions