]> git.ipfire.org Git - thirdparty/qemu.git/commit - hw/misc/applesmc.c
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 21 Feb 2014 14:38:23 +0000 (14:38 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 21 Feb 2014 14:38:23 +0000 (14:38 +0000)
commit7a87a7b3e4213f7b020e434b14f8890d41b93fb7
tree8ab8b8c40280a3693718f5f095a61d7ab64407bb
parente607784fedbf235599dc9a7ed96b624f6ecd1dd5
parent94783de6fe746f86a357bc4e3e6759f7f8ad3b39
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

Tracing pull request

# gpg: Signature made Wed 19 Feb 2014 15:42:20 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace-events: Fix typo in "offset"
  Add ust generated files to .gitignore
  Update documentation for LTTng ust tracing
  Adapt Makefiles to the new LTTng ust interface
  Modified the tracetool framework for LTTng 2.x
  Fix configure script for LTTng 2.x

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