diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-17 14:07:25 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-17 14:07:25 +0100 |
commit | 5a3fd960f39c17cef5ffa8703652bea3828bbe48 (patch) | |
tree | 41dd4f59f41782fb9a7f1afe9bfa05bb5060c3da /hw/ide | |
parent | 3f5e34a45c78086b73ec4e1a0268ec26169fee80 (diff) | |
parent | 2531088f6c1ce1f620f8d5a545f0af95598e69fc (diff) |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Tue 17 May 2016 14:06:54 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/tracing-pull-request:
hw/intc/arm_gic: add tracepoints
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide')
0 files changed, 0 insertions, 0 deletions