Merge branches 'thermal-core' and 'thermal-intel' of .git into next

2026-09-26 18:16:26 +00:00 · 2015-09-02 10:08:02 +08:00 · 2015-09-02 10:08:02 +08:00 · 5a924a07f8
commit 5a924a07f8
parent 64291f7db5 934c93b8c1 d0a12625d2
44 changed files with 509 additions and 197 deletions
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
--- a/drivers/hwmon/ntc_thermistor.c
+++ b/drivers/hwmon/ntc_thermistor.c
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
--- a/drivers/input/touchscreen/sun4i-ts.c
+++ b/drivers/input/touchscreen/sun4i-ts.c
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
--- a/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
--- a/drivers/thermal/db8500_thermal.c
+++ b/drivers/thermal/db8500_thermal.c
--- a/drivers/thermal/dove_thermal.c
+++ b/drivers/thermal/dove_thermal.c
--- a/drivers/thermal/fair_share.c
+++ b/drivers/thermal/fair_share.c
--- a/drivers/thermal/gov_bang_bang.c
+++ b/drivers/thermal/gov_bang_bang.c
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
--- a/drivers/thermal/int340x_thermal/int340x_thermal_zone.c
+++ b/drivers/thermal/int340x_thermal/int340x_thermal_zone.c
--- a/drivers/thermal/int340x_thermal/int340x_thermal_zone.h
+++ b/drivers/thermal/int340x_thermal/int340x_thermal_zone.h
--- a/drivers/thermal/int340x_thermal/processor_thermal_device.c
+++ b/drivers/thermal/int340x_thermal/processor_thermal_device.c
--- a/drivers/thermal/intel_pch_thermal.c
+++ b/drivers/thermal/intel_pch_thermal.c
--- a/drivers/thermal/intel_powerclamp.c
+++ b/drivers/thermal/intel_powerclamp.c
--- a/drivers/thermal/intel_quark_dts_thermal.c
+++ b/drivers/thermal/intel_quark_dts_thermal.c
--- a/drivers/thermal/intel_soc_dts_iosf.c
+++ b/drivers/thermal/intel_soc_dts_iosf.c
--- a/drivers/thermal/kirkwood_thermal.c
+++ b/drivers/thermal/kirkwood_thermal.c
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
--- a/drivers/thermal/power_allocator.c
+++ b/drivers/thermal/power_allocator.c
--- a/drivers/thermal/qcom-spmi-temp-alarm.c
+++ b/drivers/thermal/qcom-spmi-temp-alarm.c
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
--- a/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
--- a/drivers/thermal/st/st_thermal.c
+++ b/drivers/thermal/st/st_thermal.c
--- a/drivers/thermal/step_wise.c
+++ b/drivers/thermal/step_wise.c
--- a/drivers/thermal/tegra_soctherm.c
+++ b/drivers/thermal/tegra_soctherm.c
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
--- a/drivers/thermal/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/x86_pkg_temp_thermal.c
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
--- a/include/trace/events/thermal_power_allocator.h
+++ b/include/trace/events/thermal_power_allocator.h