summary refs log tree commit diff stats
path: root/linux-user
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-08-15 18:27:51 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-08-15 18:27:51 +0100
commitaba5d9766454ed4b72d0deb43bbad0356eeb336e (patch)
tree8c7dfdcce7a3862095eb6ba2aba14a990c31335c /linux-user
parente57218b6ed9d8e45585eea8fe1dc49068f51a1d2 (diff)
parente723b8710356163e0f1722b94f988a8ddf83f17a (diff)
downloadfocaccia-qemu-aba5d9766454ed4b72d0deb43bbad0356eeb336e.tar.gz
focaccia-qemu-aba5d9766454ed4b72d0deb43bbad0356eeb336e.zip
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Fri 12 Aug 2016 11:48:03 BST
# 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:
  trace-events: fix first line comment in trace-events

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/trace-events2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/trace-events b/linux-user/trace-events
index 80a2e07812..fc71f91ccb 100644
--- a/linux-user/trace-events
+++ b/linux-user/trace-events
@@ -1,4 +1,4 @@
-# See docs/trace-events.txt for syntax documentation.
+# See docs/tracing.txt for syntax documentation.
 
 # linux-user/signal.c
 user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=%"PRIx64