From: Anthony Liguori Date: Mon, 19 Nov 2012 14:32:03 +0000 (-0600) Subject: Merge remote-tracking branch 'stefanha/tracing' into staging X-Git-Tag: v2.7.1~3976 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c562d15d318e4ad9293032553472da71039a270f;p=mirror_qemu.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 --- c562d15d318e4ad9293032553472da71039a270f