From: Peter Maydell Date: Fri, 26 Sep 2014 17:44:25 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-09-26' into staging X-Git-Tag: v2.7.1~1486 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e80084d352be64913f28d7b706fec644b85face4;p=mirror_qemu.git Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-09-26' into staging trivial patches for 2014-09-26 # gpg: Signature made Fri 26 Sep 2014 18:33:53 BST using RSA key ID A4C3D7DB # gpg: Good signature from "Michael Tokarev " # gpg: aka "Michael Tokarev " # gpg: aka "Michael Tokarev " # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5 # Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514 66A7 BEE5 9D74 A4C3 D7DB * remotes/mjt/tags/trivial-patches-2014-09-26: os-posix: report error message when lock file failed os-posix: remove confused errno os-posix: change tab to space avoid violating coding style qapi: Update docs given recent event, spacing fixes qapi: Ignore files created during make check qapi: Consistent whitespace in tests/Makefile vmxcap: Update according to SDM of September 2014 .travis.yml: remove "make check" from main matrix .travis.yml: pre-seed sub-modules for speed .travis.yml: make the make slightly more parallel .travis.yml: add more linux-user to the build matrix tests: avoid running duplicate qom-tests Signed-off-by: Peter Maydell --- e80084d352be64913f28d7b706fec644b85face4