From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 19 Nov 2012 14:32:03 +0000 (-0600)
Subject: Merge remote-tracking branch 'stefanha/tracing' into staging
X-Git-Tag: v1.3.0-rc0~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c562d15d318e4ad9293032553472da71039a270f;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'stefanha/tracing' into staging

* stefanha/tracing:
  trace: Remove "info trace" from documents
  trace: document '-' syntax for disabling events
  trace: allow disabling events in events file
  Avoid all systemtap reserved words

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

c562d15d318e4ad9293032553472da71039a270f