| commit | 98ee74a75ca0f047e75400afa712f7bf08268b8e | [log] [tgz] |
|---|---|---|
| author | Frederic Weisbecker <fweisbec@gmail.com> | Fri Aug 27 02:28:40 2010 +0200 |
| committer | Frederic Weisbecker <fweisbec@gmail.com> | Fri Aug 27 02:30:07 2010 +0200 |
| tree | c87b267f1e279173696f2294b3930940f1a5b570 | |
| parent | 7de5d895b2020260190db0021de646f3f22f755e [diff] | |
| parent | 5225c45899e872383ca39f5533d28ec63c54b39e [diff] |
Merge branch 'perf/urgent' into perf/core Conflicts: tools/perf/util/callchain.h Merge reason: Fix a non-trivial conflict with latest fixes