Merge branch into tip/master: 'x86/cpu'

 # New commits in x86/cpu:
    43bb700cff6b ("x86/cpu: Update Intel Family comments")
    64aad4749d79 ("ACPI/processor_idle: Export acpi_processor_ffh_play_dead()")
    96040f7273e2 ("x86/smp: Eliminate mwait_play_dead_cpuid_hint()")
    fc4ca9537bc4 ("intel_idle: Provide the default enter_dead() handler")
    541ddf31e300 ("ACPI/processor_idle: Add FFH state handling")
    a7dd183f0b38 ("x86/smp: Allow calling mwait_play_dead with an arbitrary hint")
    1e66d6cf888f ("x86/cpu: Fix #define name for Intel CPU model 0x5A")

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/events/intel/core.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc drivers/powercap/intel_rapl_common.c
Simple merge