Conflicts: tools/perf/builtin-record.c tools/perf/builtin-top.c tools/perf/perf.h tools/perf/util/top.h Merge reason: resolve these cherry-picking conflicts. Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| auto_group.c | ||
| auto_group.h | ||
| clock.c | ||
| core.c | ||
| cpupri.c | ||
| cpupri.h | ||
| debug.c | ||
| fair.c | ||
| features.h | ||
| idle_task.c | ||
| rt.c | ||
| sched.h | ||
| stats.c | ||
| stats.h | ||
| stop_task.c | ||