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> |
||
|---|---|---|
| .. | ||
| events | ||
| boot.h | ||
| define_trace.h | ||
| ftrace.h | ||
| power.h | ||
| syscall.h | ||
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> |
||
|---|---|---|
| .. | ||
| events | ||
| boot.h | ||
| define_trace.h | ||
| ftrace.h | ||
| power.h | ||
| syscall.h | ||