diff options
author | Peter Maydell | 2018-07-19 19:25:53 +0200 |
---|---|---|
committer | Peter Maydell | 2018-07-19 19:25:53 +0200 |
commit | 0b46a3f005458311d6fa479c1f5f8fe3da562d61 (patch) | |
tree | 5d653b7c776ae5e2479ee31b98e5abf0516e5574 /hw/net/e1000e_core.c | |
parent | Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-pull-20180719'... (diff) | |
parent | tracing: Use double-dash spelling for trace option (diff) | |
download | qemu-0b46a3f005458311d6fa479c1f5f8fe3da562d61.tar.gz qemu-0b46a3f005458311d6fa479c1f5f8fe3da562d61.tar.xz qemu-0b46a3f005458311d6fa479c1f5f8fe3da562d61.zip |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Pull request
Contains a fix to use double-dash consistently with tracing command-line
options in documentation and output.
# gpg: Signature made Thu 19 Jul 2018 17:24:51 BST
# gpg: using RSA key 9CA4ABB381AB73C8
# 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:
tracing: Use double-dash spelling for trace option
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/e1000e_core.c')
0 files changed, 0 insertions, 0 deletions