| commit | aeffe2abc894b585acbe0923c0d4f21b4c5c1035 | |
| author | Ingo Molnar <mingo@kernel.org> | |
| Thu, 1 May 2014 06:24:39 +0000 (1 08:24 +0200) | ||
| committer | Ingo Molnar <mingo@kernel.org> | |
| Thu, 1 May 2014 06:24:39 +0000 (1 08:24 +0200) | ||
| tree | ad712872dba8b8b1aa159fdb0f6dc7cc0ab5f9c6 | treesnapshot (tar.gz zip) |
| parent | 201131998fbf074b03679afedcc29948e63331ef | commitdiff |
| parent | 399f0c220a0ee97a5a9ea1a699a58fe2aacf2983 | commitdiff |
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>
Conflicts:
tools/perf/arch/x86/tests/dwarf-unwind.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| tools/perf/Makefile.perf | diff1 | diff2 | blobhistory |
| tools/perf/arch/x86/tests/dwarf-unwind.c | diff1 | diff2 | blobhistory |
| tools/perf/util/machine.c | diff1 | diff2 | blobhistory |