diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-11 17:13:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-11 17:13:49 +0100 |
| commit | 31fe1c414501047cbb91b695bdccc0068496dcf6 (patch) | |
| tree | dda96645dcc10c804af442b679e5b0808f036cb5 /hw/net/xilinx_axienet.c | |
| parent | aa916e409c04cb614ec2fee8b6b33836bf5998bb (diff) | |
| parent | cbea0ac4fe4989ae70088e01ad8b5e99f7ce3846 (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Tue 11 Jul 2017 09:35:26 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:
backends: remove empty trace-events file
trace: Fix early setting of events with the "vcpu" property
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/xilinx_axienet.c')
0 files changed, 0 insertions, 0 deletions