diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-15 09:51:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-15 09:51:24 +0100 |
| commit | 0ffa798d947f5f5e40690cc9d38e678080a34f87 (patch) | |
| tree | a9e25ba4431de513d4c83201429e9ff301cbaf50 /tools/perf/perf.c | |
| parent | Merge commit 'v2.6.32-rc7' into perf/core (diff) | |
| parent | powerpc: perf_event: Cleanup output by adding symbols (diff) | |
| parent | perf bench: Improve sched-message.c with more comfortable output (diff) | |
| download | linux-0ffa798d947f5f5e40690cc9d38e678080a34f87.tar.xz linux-0ffa798d947f5f5e40690cc9d38e678080a34f87.zip | |
Merge branches 'perf/powerpc' and 'perf/bench' into perf/core
Merge reason: Both 'perf bench' and the pending PowerPC changes
are now ready for the next merge window.
Signed-off-by: Ingo Molnar <mingo@elte.hu>