diff options
author | Peter Maydell | 2019-03-14 17:19:37 +0100 |
---|---|---|
committer | Peter Maydell | 2019-03-14 17:19:37 +0100 |
commit | 7074ab12c81a1b2b1e0e1c40983f56b2c5ccc494 (patch) | |
tree | 7534a14882a764862b6e1f7457e554315e782f4b /hw/intc/bcm2836_control.c | |
parent | Merge remote-tracking branch 'remotes/stsquad/tags/pull-gitdm-next-120319-1' ... (diff) | |
parent | tests/.gitignore: ignore test-qapi-emit-events.[ch] for in-tree builds (diff) | |
download | qemu-7074ab12c81a1b2b1e0e1c40983f56b2c5ccc494.tar.gz qemu-7074ab12c81a1b2b1e0e1c40983f56b2c5ccc494.tar.xz qemu-7074ab12c81a1b2b1e0e1c40983f56b2c5ccc494.zip |
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>
Diffstat (limited to 'hw/intc/bcm2836_control.c')
0 files changed, 0 insertions, 0 deletions