projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1ab8f86 776ec96)
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 18 Nov 2014 15:05:36 +0000 (15:05 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 18 Nov 2014 15:05:36 +0000 (15:05 +0000)
commitb1b1e81fb51965bb53be3d58d3dd9b3b3aa17242
treece7f2c51e2798d2177b9d617561fbd154312e7b3tree | snapshot
parent1ab8f867ef2ef0aa259e0e0d1040d67350af1beccommit | diff
parent776ec96f790e2c943c13313d8ecab4713b47ab65commit | diff
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>
Domain: SDK / Emulator;