diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-03 16:17:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-03 16:17:28 +0100 |
| commit | b041066421e8dcc7d080dfcfd83551c9c9f24ade (patch) | |
| tree | 48a0167a139d9dde4c07237d32460ea10b2872db /qom/object.c | |
| parent | 550e66ea4cce7b6664d6caf7e651814cc2d30421 (diff) | |
| parent | 987bd27000b6e21df6c73f6badb945ab5e42996a (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Thu 03 Sep 2015 15:46:52 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-events: Add hmp completion
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom/object.c')
0 files changed, 0 insertions, 0 deletions