Ingo Molnar 77e5517cb5 Merge branch 'linus' into x86/cpu, to resolve conflicts ... Conflicts: tools/power/x86/turbostat/turbostat.c Recent turbostat changes conflicted with a pending rename of x86 model names in tip:x86/cpu, sort it out. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2019-09-02 09:10:07 +02:00
..
.gitignore
Makefile	tools/power/x86: Enable compiler optimisations and Fortify by default	2019-08-31 14:48:34 -04:00
turbostat.8	tools/power turbostat: Update turbostat(8) RAPL throttling column description	2018-07-17 20:06:47 -04:00
turbostat.c	Merge branch 'linus' into x86/cpu, to resolve conflicts	2019-09-02 09:10:07 +02:00