git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 119e7a2 d498bc1)
Merge branch 'perfcounters/tracing' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Mon, 31 Aug 2009 08:03:25 +0000 (10:03 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 31 Aug 2009 08:03:27 +0000 (10:03 +0200)
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>
1  2 
tools/perf/builtin-report.c patch | diff1 | diff2 | blob | history
tools/perf/util/util.h patch | diff1 | diff2 | blob | history

diff --cc tools/perf/builtin-report.c
Simple merge
diff --cc tools/perf/util/util.h
Simple merge
Full containers within linux kernel