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> |
||
---|---|---|
.. | ||
governors | ||
Kconfig | ||
Makefile | ||
cpuidle.c | ||
cpuidle.h | ||
driver.c | ||
governor.c | ||
sysfs.c |