Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
commit4101dfe0cd21a13514ebaeb2f429cb68d8bc5f37
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 7 Jan 2016 10:19:28 +0000 (7 10:19 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 7 Jan 2016 10:19:28 +0000 (7 10:19 +0000)
tree1c166bed2452d15d05ef6951eebc014794edaaeb
parent38a762fec63fd5c035aae29ba9a77d357e21e4a7
parentcef517ca4bf890ef5405aac1b95f75dcda043d6a
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

# gpg: Signature made Thu 07 Jan 2016 09:13:22 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 make dependencies on tracetool source
  trace: fix make foo-timestamp rules
  trace: fix PRIx64 constants in trace-events
  trace: reflect the file name change

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>