]> git.ipfire.org Git - thirdparty/qemu.git/commit - hw/net/lan9118.c
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 29 Apr 2019 18:11:15 +0000 (19:11 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 29 Apr 2019 18:11:15 +0000 (19:11 +0100)
commit22d96eac64877c4d96f9928babb6f2fcc68faacf
treee221e4f99126df5089be8ee37fd4148b05b6ea44
parent82b2865e0d0ea4c1001e9e7ed7920bcc0458f6de
parentb1939fcd438b7140cb8f2685dee026bb112819d7
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

Pull request

# gpg: Signature made Mon 29 Apr 2019 17:10:40 BST
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: fix runstate tracing

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>