| commit | 30e7d092b26146eb2abb77e0a0952aea012e36bf | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 6 Sep 2016 11:41:24 +0000 (6 12:41 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 6 Sep 2016 11:41:24 +0000 (6 12:41 +0100) | ||
| tree | 8188256de4bf74dde49d9f048c4af3b4212b70ea | treesnapshot (tar.gz zip) |
| parent | 1fd66154fdf8305e6668a96046a22b863b4d7320 | commitdiff |
| parent | 8eb1b9db559e243043aaeac3a0aa97e1f4a403c4 | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Mon 05 Sep 2016 20:41:04 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
trace: Avoid implicit bool->integer conversions
trace: Remove 'trace_events_dstate_init'
trace: add syslog tracing backend
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Mon 05 Sep 2016 20:41:04 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
trace: Avoid implicit bool->integer conversions
trace: Remove 'trace_events_dstate_init'
trace: add syslog tracing backend
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>