From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 15 Aug 2016 17:27:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
X-Git-Tag: v2.7.0-rc3~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=aba5d9766454ed4b72d0deb43bbad0356eeb336e;p=qemu-xen-unstable.git

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>
---

aba5d9766454ed4b72d0deb43bbad0356eeb336e