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
..
asm	Merge branch 'linus' into x86/cpu, to resolve conflicts	2019-09-02 09:10:07 +02:00
uapi/asm	treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers	2019-07-25 11:05:10 +02:00