diff options
| author |   Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-27 02:28:40 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-27 02:30:07 +0200 |
| commit | 98ee74a75ca0f047e75400afa712f7bf08268b8e (patch) | |
| tree | c87b267f1e279173696f2294b3930940f1a5b570 /tools/perf/util/hist.c | |
| parent | Merge branch 'linus' into perf/core (diff) | |
| parent | perf: Initialize callchains roots's childen hits (diff) | |
| download | linux-dev-98ee74a75ca0f047e75400afa712f7bf08268b8e.tar.xz linux-dev-98ee74a75ca0f047e75400afa712f7bf08268b8e.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/callchain.h
Merge reason:
Fix a non-trivial conflict with latest fixes
Diffstat (limited to 'tools/perf/util/hist.c')
0 files changed, 0 insertions, 0 deletions