diff options
| author | Ingo Molnar | 2015-09-16 09:19:56 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-09-16 09:19:56 +0200 |
| commit | d71b0ad8d30922ccdd0705318237e6890b4ec1b6 (patch) | |
| tree | 347c773357c1afc87d65f767258317164bc0e31e /tools/perf/config/Makefile | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | kernel-qcow2-linux-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.tar.gz kernel-qcow2-linux-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.tar.xz kernel-qcow2-linux-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.zip | |
Merge branch 'perf/urgent' into perf/core, to resolve a conflict
Conflicts:
tools/perf/ui/browsers/hists.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/config/Makefile')
0 files changed, 0 insertions, 0 deletions