diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-28 17:20:11 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-28 17:20:11 +0100 |
commit | b8dc35b2526278296390fffa80b5c82573ed178a (patch) | |
tree | 3cd1ac1e23c2f7ff4a8af79c5d24f87ee41f2e71 /fsdev/virtfs-proxy-helper.c | |
parent | aba0fb1e2e8a6b5c76c07a1d24c587d77154491d (diff) | |
parent | 7609ffb9191e3fc473203f4bd58b934161eab358 (diff) |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Tue 28 Mar 2017 15:22:59 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: fix tcg tracing build breakage
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'fsdev/virtfs-proxy-helper.c')
0 files changed, 0 insertions, 0 deletions