Resolved merge conflict in tools/perf/Makefile Merge reason: we want to queue up a dependent patch. Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
|---|---|---|
| .. | ||
| postprocess | ||
| events-kmem.txt | ||
| events.txt | ||
| ftrace-design.txt | ||
| ftrace.txt | ||
| function-graph-fold.vim | ||
| kmemtrace.txt | ||
| kprobetrace.txt | ||
| mmiotrace.txt | ||
| ring-buffer-design.txt | ||
| tracepoint-analysis.txt | ||
| tracepoints.txt | ||