projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8593efa bc78cff)
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 1 Jul 2014 13:21:50 +0000 (14:21 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 1 Jul 2014 13:21:50 +0000 (14:21 +0100)
Tracing pull request

# gpg: Signature made Tue 01 Jul 2014 09:56:27 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 qemu_system_powerdown_request and qemu_system_shutdown_request trace events

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
vl.c patch | diff1 | diff2 | blob | history

diff --cc vl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.