From: Peter Maydell Date: Wed, 4 Mar 2015 15:33:05 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c10b02836ff02fcd09367316260f9368c5c92f28;p=qemu.git Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging # gpg: Signature made Mon Mar 2 21:45:18 2015 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/tracing-pull-request: trace: add DTrace reserved words for .d files unbreak dtrace tracing due to double _ in rdma names Signed-off-by: Peter Maydell --- c10b02836ff02fcd09367316260f9368c5c92f28