]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into x86/cpu, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 2 Sep 2019 07:10:07 +0000 (09:10 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 2 Sep 2019 07:10:07 +0000 (09:10 +0200)
commit157f9c28cf8a5f791c4f1c5886deb90ba40628c7
treee057ab71829a12ded68d9d22e661f0e391b5ad6b
parentfe64b654bbd8f366e3f2ba56710e2c439a0551fb
parentf7fbc125661a5c2334241d44ec29f27a18f5fc38
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>
arch/x86/events/intel/core.c
arch/x86/kernel/apic/apic.c
tools/power/x86/turbostat/turbostat.c