| commit | ba7fccfffecf5915bb8a40e70cba40ba2a3284b4 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 1 Jun 2018 15:07:11 +0000 (1 16:07 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 1 Jun 2018 15:07:11 +0000 (1 16:07 +0100) | ||
| tree | a0c2f344aeefece3551eb642ba4f2c98cfb6098a | treesnapshot (tar.gz zip) |
| parent | 9be4af13305f24d2dabf94bb53e6b65c76d08bb2 | commitdiff |
| parent | eb7ccb3c0e14ae5b6ce3254165b91a7ed77527dd | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Pull request
# gpg: Signature made Fri 01 Jun 2018 16:03:58 BST
# gpg: using RSA key 9CA4ABB381AB73C8
# 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: Sort trace-events-subdirs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Pull request
# gpg: Signature made Fri 01 Jun 2018 16:03:58 BST
# gpg: using RSA key 9CA4ABB381AB73C8
# 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: Sort trace-events-subdirs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>