From: Anthony Liguori Date: Mon, 22 Jul 2013 15:13:15 +0000 (-0500) Subject: Merge remote-tracking branch 'stefanha/tracing' into staging X-Git-Tag: v1.6.0-rc0~107 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90c66f587c8d020a642d3c9376f9102c16f2234e;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'stefanha/tracing' into staging # By Markus Armbruster # Via Stefan Hajnoczi * stefanha/tracing: trace-events: Fix up source file comments trace-events: Drop unused events milkymist-minimac2: Fix minimac2_read/_write tracepoints slavio_misc: Fix slavio_led_mem_readw/_writew tracepoints cleanup-trace-events.pl: New Message-id: 1374119369-26496-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori --- 90c66f587c8d020a642d3c9376f9102c16f2234e