Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 4 Mar 2015 15:33:05 +0000 (15:33 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 4 Mar 2015 15:33:05 +0000 (15:33 +0000)
commitc10b02836ff02fcd09367316260f9368c5c92f28
tree007358ba120f922ee005276f425438a8c2934365
parent3539bbb93e944ffde31c61c369ea9eedcc5697a6
parent0b7e89b103b899c21b9ab37dbf9b832db8d18108
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 <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* 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 <peter.maydell@linaro.org>