Merge branch 'perfcounters/tracing' into perfcounters/core
commit19c959627a3477a8487d08afd47fdc1f4fea60e5
authorIngo Molnar <mingo@elte.hu>
Mon, 31 Aug 2009 08:03:25 +0000 (31 10:03 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 31 Aug 2009 08:03:27 +0000 (31 10:03 +0200)
treeaaeda0f81bc100ce8f71af129f39b5f2e6e934bf
parent119e7a22bb70d84849384e5113792cd45afa4f85
parentd498bc1f6261dd6f655440eb2f1c7fa25694d3ba
Merge branch 'perfcounters/tracing' into perfcounters/core

Merge reason: this topic is ready now to merge into the main
              development branch for .32, with functional
              perf trace output.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
tools/perf/builtin-report.c
tools/perf/util/util.h