Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 14 Mar 2019 16:19:37 +0000 (16:19 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 14 Mar 2019 16:19:37 +0000 (16:19 +0000)
commit7074ab12c81a1b2b1e0e1c40983f56b2c5ccc494
tree7534a14882a764862b6e1f7457e554315e782f4b
parent9164add701788075f229b560bc3e92f6562ff857
parenta0af8cee3cf6c2fc08fee5b69820c2f91d5b0b44
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging

.gitignore updates for v4.0

# gpg: Signature made Thu 14 Mar 2019 15:04:29 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  tests/.gitignore: ignore test-qapi-emit-events.[ch] for in-tree builds
  .gitignore: ignore docs/built created for in-tree builds
  maint: Ignore built elf2dmp

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>