diff options
| author | Peter Maydell | 2015-03-04 16:33:05 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-04 16:33:05 +0100 |
| commit | c10b02836ff02fcd09367316260f9368c5c92f28 (patch) | |
| tree | 007358ba120f922ee005276f425438a8c2934365 /include/hw/virtio/virtio-net.h | |
| parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150302.0' i... (diff) | |
| parent | trace: add DTrace reserved words for .d files (diff) | |
| download | qemu-c10b02836ff02fcd09367316260f9368c5c92f28.tar.gz qemu-c10b02836ff02fcd09367316260f9368c5c92f28.tar.xz qemu-c10b02836ff02fcd09367316260f9368c5c92f28.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Mon Mar 2 21:45:18 2015 GMT 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: add DTrace reserved words for .d files
unbreak dtrace tracing due to double _ in rdma names
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/virtio/virtio-net.h')
0 files changed, 0 insertions, 0 deletions