From: Peter Maydell Date: Fri, 1 Jun 2018 15:07:11 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ba7fccfffecf5915bb8a40e70cba40ba2a3284b4;p=qemu.git 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 " # gpg: aka "Stefan Hajnoczi " # 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 --- ba7fccfffecf5915bb8a40e70cba40ba2a3284b4