From: Peter Maydell Date: Tue, 1 Apr 2014 19:45:42 +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=82c6f513735297ad76acaaf2e87f0c5a0b3647a7;p=qemu.git Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging Tracing pull request # gpg: Signature made Tue 01 Apr 2014 19:08:48 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/tracing-pull-request: trace: add workaround for SystemTap PR13296 Signed-off-by: Peter Maydell --- 82c6f513735297ad76acaaf2e87f0c5a0b3647a7