| commit | 81a6a2d48a6c7543a03265bcc5c5bbb0d929d894 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 15 Aug 2017 13:29:03 +0000 (15 14:29 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 15 Aug 2017 13:29:03 +0000 (15 14:29 +0100) | ||
| tree | f83c09c7048ce12ad4dc5bfb3f8f95be95536110 | treesnapshot (tar.gz zip) |
| parent | c4a6a8887c1b2a669e35ff9da9530824300bdce4 | commitdiff |
| parent | 840d8351774664d01c328d31ed33b0e2d85c866e | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Tue 15 Aug 2017 14:27:34 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:
simpletrace: fix flight recorder --no-header option
trace: use static event ID mapping in simpletrace.stp
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Tue 15 Aug 2017 14:27:34 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:
simpletrace: fix flight recorder --no-header option
trace: use static event ID mapping in simpletrace.stp
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>