From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 18 Nov 2014 15:05:36 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b1b1e81fb51965bb53be3d58d3dd9b3b3aa17242;p=qemu.git

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

# gpg: Signature made Tue 18 Nov 2014 15:04:14 GMT 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:
  Tracing: Fix simpletrace.py error on tcg enabled binary traces
  Tracing docs fix configure option and description

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

b1b1e81fb51965bb53be3d58d3dd9b3b3aa17242