| commit | b37686f7e84b22cfaf7fd01ac5133f2617cc3027 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 9 Oct 2015 11:18:13 +0000 (9 12:18 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 9 Oct 2015 11:18:14 +0000 (9 12:18 +0100) | ||
| tree | 61130f2388058912040c1b1972662f3aadbe5d8b | treesnapshot (tar.gz zip) |
| parent | 8be6e623a28497d1dcd10547a573c9143ece525c | commitdiff |
| parent | 98cf48f60aa4999f5b2808569a193a401a390e6a | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Fri 09 Oct 2015 10:15:13 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: remove malloc tracing
docs: update the usage example of "dtrace" backend in tracing.txt
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Fri 09 Oct 2015 10:15:13 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: remove malloc tracing
docs: update the usage example of "dtrace" backend in tracing.txt
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>