| commit | 96d6e48bc6b38342a59ccd23e25907d12caaeaf8 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Aug 19 14:50:35 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Aug 24 09:24:01 2009 +0200 |
| tree | b770d9e94545e198e120fac31f650600a855f689 | |
| parent | 6e086437f35ad9fda448711732c4ce0f82aad569 [diff] | |
| parent | 4464fcaa9cbfc9c551956b48af203e2f775ca892 [diff] |
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>