Merge remote-tracking branch 'thermal/next'

diff --cc drivers/acpi/thermal.c
Simple merge

diff --cc drivers/hwmon/Kconfig
index c74e73b2069ad230cd1be4ae4d7510252d44f52b,84e02b416a4ae11cd4a6745de431a0bc61b02583..c4633de64465a2eccc5d0305238feee8a8c28375
--- 1/drivers/hwmon/Kconfig
--- 2/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@@ -334,19 -324,9 +334,9 @@@ config SENSORS_DA9052_AD
          This driver can also be built as module. If so, the module
          will be called da9052-hwmon.
  
- config SENSORS_EXYNOS4_TMU
-       tristate "Temperature sensor on Samsung EXYNOS4"
-       depends on ARCH_EXYNOS4
-       help
-         If you say yes here you get support for TMU (Thermal Management
-         Unit) on SAMSUNG EXYNOS4 series of SoC.
- 
-         This driver can also be built as a module. If so, the module
-         will be called exynos4-tmu.
- 
  config SENSORS_I5K_AMB
        tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets"
 -      depends on PCI && EXPERIMENTAL
 +      depends on PCI
        help
          If you say yes here you get support for FB-DIMM AMB temperature
          monitoring chips on systems with the Intel 5000 series chipset.

diff --cc drivers/hwmon/Makefile
Simple merge