Merge remote-tracking branch 'stefanha/tracing' into staging
commitaba8e41e8666e4c0287cef1f6298985d4e03211d
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 2 Apr 2012 14:44:35 +0000 (2 09:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 2 Apr 2012 14:44:35 +0000 (2 09:44 -0500)
treef45bd6a31c5c12db334d8645bce61ab9d8b05c53
parentdfe844c9043815497b6472bfaf470b0f8d2e7312
parent703e01e6e249e6d0a74e0cbab827b235032ec7f3
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
Makefile.target
scripts/tracetool