diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-04 15:33:05 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-04 15:33:05 +0000 |
| commit | c10b02836ff02fcd09367316260f9368c5c92f28 (patch) | |
| tree | 007358ba120f922ee005276f425438a8c2934365 /hw | |
| parent | 3539bbb93e944ffde31c61c369ea9eedcc5697a6 (diff) | |
| parent | 0b7e89b103b899c21b9ab37dbf9b832db8d18108 (diff) | |
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 'hw')
0 files changed, 0 insertions, 0 deletions