From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 1 Apr 2014 19:45:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~933
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82c6f513735297ad76acaaf2e87f0c5a0b3647a7;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

Tracing pull request

# gpg: Signature made Tue 01 Apr 2014 19:08:48 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/tracing-pull-request:
  trace: add workaround for SystemTap PR13296

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

82c6f513735297ad76acaaf2e87f0c5a0b3647a7