From: Peter Maydell Date: Tue, 17 May 2016 13:07:25 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging X-Git-Tag: v2.7.1~337 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5a3fd960f39c17cef5ffa8703652bea3828bbe48;p=mirror_qemu.git Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging # gpg: Signature made Tue 17 May 2016 14:06:54 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/tracing-pull-request: hw/intc/arm_gic: add tracepoints Signed-off-by: Peter Maydell --- 5a3fd960f39c17cef5ffa8703652bea3828bbe48