3772b73472
Conflicts: tools/perf/Makefile tools/perf/util/hist.c Merge reason: Resolve the conflicts and update to latest upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
cpufreq.c | ||
cpufreq_conservative.c | ||
cpufreq_ondemand.c | ||
cpufreq_performance.c | ||
cpufreq_powersave.c | ||
cpufreq_stats.c | ||
cpufreq_userspace.c | ||
freq_table.c |