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
..
acpi	Merge branches 'acpi-tables', 'acpi-osl', 'acpi-misc' and 'acpi-tools'	2019-07-08 11:02:22 +02:00
cpupower	kbuild: create *.mod with full directory path and remove MODVERDIR	2019-07-18 02:19:31 +09:00
pm-graph	Merge back earlier pm-tools material for v5.3.	2019-06-13 11:06:21 +02:00
x86	Merge branch 'linus' into x86/cpu, to resolve conflicts	2019-09-02 09:10:07 +02:00