diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-15 18:27:51 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-15 18:27:51 +0100 |
commit | aba5d9766454ed4b72d0deb43bbad0356eeb336e (patch) | |
tree | 8c7dfdcce7a3862095eb6ba2aba14a990c31335c /hw/dma/bcm2835_dma.c | |
parent | e57218b6ed9d8e45585eea8fe1dc49068f51a1d2 (diff) | |
parent | e723b8710356163e0f1722b94f988a8ddf83f17a (diff) | |
download | qemu-aba5d9766454ed4b72d0deb43bbad0356eeb336e.tar.gz qemu-aba5d9766454ed4b72d0deb43bbad0356eeb336e.tar.bz2 qemu-aba5d9766454ed4b72d0deb43bbad0356eeb336e.zip |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Fri 12 Aug 2016 11:48:03 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
trace-events: fix first line comment in trace-events
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/dma/bcm2835_dma.c')
0 files changed, 0 insertions, 0 deletions