projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 53e11bd 9bcec93)
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 1 Apr 2014 19:45:42 +0000 (20:45 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 1 Apr 2014 19:45:43 +0000 (20:45 +0100)
commit82c6f513735297ad76acaaf2e87f0c5a0b3647a7
tree471e94a1ec8836ca6b970d158f8604e358c9e62atree | snapshot
parent53e11bd384a799c03884bd7d8b5be53f025f8e2dcommit | diff
parent9bcec938aab22a1b7ced916a6895e5029d4ed04fcommit | diff
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 <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/tracing-pull-request:
  trace: add workaround for SystemTap PR13296

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Unnamed repository; edit this file 'description' to name the repository.