]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
projects / users / dwmw2 / qemu.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfe844c 703e01e)
Merge remote-tracking branch 'stefanha/tracing' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 2 Apr 2012 14:44:35 +0000 (09:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 2 Apr 2012 14:44:35 +0000 (09:44 -0500)
* stefanha/tracing:
  tracetool: dtrace: handle in and next reserved words
  tracetool: dtrace disabled-events fix
  Makefile.target: code stp dependency on trace-events

1  2 
Makefile.target patch | diff1 | diff2 | blob | history
scripts/tracetool patch | diff1 | diff2 | blob | history

diff --cc Makefile.target
Simple merge
diff --cc scripts/tracetool
Simple merge
Unnamed repository; edit this file 'description' to name the repository.