]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 13 Feb 2017 16:44:04 +0000 (16:44 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 13 Feb 2017 16:44:04 +0000 (16:44 +0000)
commit305e6c8a2ff7a6e3f4942b50e853230f18eeb5a9
tree6a1690cf5297af2eebbbe030cf95f0905507f984
parentdf96bfab49dab2d0373e49b51bbb51ce72e1601e
parent6eab3544f47207e976df37a85c5855bf55754713
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

# gpg: Signature made Mon 13 Feb 2017 16:29:26 GMT
# 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:
  Makefile: Make "install" depend on "trace-events-all"
  docs: update manpage for stderr->log rename

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