| commit | aac898548d04c7bff179b79f805874b0d6f87571 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Oct 29 11:23:32 2013 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Tue Oct 29 11:23:32 2013 +0100 |
| tree | e8de975fd5de6c95bf4329861a872dbcfe0c7ead | |
| parent | 2f5e98802350627ad6f2e3cee4d177059fc0c2f2 [diff] | |
| parent | cd65718712469ad844467250e8fad20a5838baae [diff] |
Merge branch 'perf/urgent' into perf/core Conflicts: tools/perf/builtin-record.c tools/perf/builtin-top.c tools/perf/util/hist.h