diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-08-19 14:50:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-24 09:24:01 +0200 |
| commit | 96d6e48bc6b38342a59ccd23e25907d12caaeaf8 (patch) | |
| tree | b770d9e94545e198e120fac31f650600a855f689 /tools/perf/util/parse-options.c | |
| parent | perf tools: Save partial non-overlapping map (diff) | |
| parent | perf_counter: Fix typo in read() output generation (diff) | |
| download | linux-dev-96d6e48bc6b38342a59ccd23e25907d12caaeaf8.tar.xz linux-dev-96d6e48bc6b38342a59ccd23e25907d12caaeaf8.zip | |
Merge branch 'perfcounters/urgent' into perfcounters/core
Conflicts:
tools/perf/builtin-annotate.c
tools/perf/builtin-report.c
Merge reason: resolve these conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/parse-options.c')
0 files changed, 0 insertions, 0 deletions