diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2014-05-01 08:24:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-01 08:24:39 +0200 |
| commit | aeffe2abc894b585acbe0923c0d4f21b4c5c1035 (patch) | |
| tree | ad712872dba8b8b1aa159fdb0f6dc7cc0ab5f9c6 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/urgent (diff) | |
| download | linux-dev-aeffe2abc894b585acbe0923c0d4f21b4c5c1035.tar.xz linux-dev-aeffe2abc894b585acbe0923c0d4f21b4c5c1035.zip | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Conflicts:
tools/perf/arch/x86/tests/dwarf-unwind.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions