Merge branches 'thermal-soc', 'thermal-core', 'thermal-intel' and 'thermal-tegra...

diff --cc drivers/thermal/Kconfig
Simple merge

diff --cc drivers/thermal/Makefile
index 7c1aca6d8b1479ca8931e4529fc2b4309091114d,10b07c14f8a9f75363323d0c69542606d8dfed96,7aa7f4c2e3da7e146b2af2d2701487b44148bfe3,10b07c14f8a9f75363323d0c69542606d8dfed96..c92eb22a41ff89f3f1c61c61977de7eb9ba516ae
--- 1/drivers/thermal/Makefile
--- 2/drivers/thermal/Makefile
--- 3/drivers/thermal/Makefile
--- 4/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@@@@ -47,9 -45,8 -45,9 -45,8 +47,10 @@@@@ obj-$(CONFIG_INTEL_SOC_DTS_THERMAL)  += 
    obj-$(CONFIG_INTEL_QUARK_DTS_THERMAL)       += intel_quark_dts_thermal.o
    obj-$(CONFIG_TI_SOC_THERMAL)        += ti-soc-thermal/
    obj-$(CONFIG_INT340X_THERMAL)  += int340x_thermal/
++ +obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) += intel_bxt_pmic_thermal.o
    obj-$(CONFIG_INTEL_PCH_THERMAL)     += intel_pch_thermal.o
    obj-$(CONFIG_ST_THERMAL)    += st/
 +++obj-$(CONFIG_QCOM_TSENS)    += qcom/
    obj-$(CONFIG_TEGRA_SOCTHERM)        += tegra/
    obj-$(CONFIG_HISI_THERMAL)     += hisi_thermal.o
    obj-$(CONFIG_MTK_THERMAL)   += mtk_thermal.o