From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 2 Apr 2012 14:44:35 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/tracing' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=aba8e41e8666e4c0287cef1f6298985d4e03211d;p=qemu.git

Merge remote-tracking branch 'stefanha/tracing' into staging

* stefanha/tracing:
  tracetool: dtrace: handle in and next reserved words
  tracetool: dtrace disabled-events fix
  Makefile.target: code stp dependency on trace-events
---

aba8e41e8666e4c0287cef1f6298985d4e03211d