Merge branches 'release' and 'thermal-soc' of .git into next

diff --cc drivers/thermal/Kconfig
Simple merge

diff --cc drivers/thermal/Makefile
Simple merge

diff --cc drivers/thermal/intel_powerclamp.c
index e34ccd5,725718e..2e67161
--- 1/drivers/thermal/intel_powerclamp.c
--- 2/drivers/thermal/intel_powerclamp.c
+++ b/drivers/thermal/intel_powerclamp.c
@@@ -689,8 -695,8 +695,9 @@@ static const struct x86_cpu_id intel_po
        { X86_VENDOR_INTEL, 6, 0x46},
        { X86_VENDOR_INTEL, 6, 0x4c},
        { X86_VENDOR_INTEL, 6, 0x4d},
+       { X86_VENDOR_INTEL, 6, 0x4f},
        { X86_VENDOR_INTEL, 6, 0x56},
 +      { X86_VENDOR_INTEL, 6, 0x57},
        {}
  };
  MODULE_DEVICE_TABLE(x86cpu, intel_powerclamp_ids);