Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

Pull ACPI & Thermal updates from Len Brown:
 "The generic Linux thermal layer is gaining some new capabilities
  (generic cooling via cpufreq) and some new customers (ARM).

  Also, an ACPI EC bug fix plus a regression fix."

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (30 commits)
  tools/power/acpi/acpidump: remove duplicated include from acpidump.c
  ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug
  cpuidle / ACPI: fix potential NULL pointer dereference
  ACPI: EC: Add a quirk for CLEVO M720T/M730T laptop
  ACPI: EC: Make the GPE storm threshold a module parameter
  thermal: Exynos: Fix NULL pointer dereference in exynos_unregister_thermal()
  Thermal: Fix bug on cpu_cooling, cooling device's id conflict problem.
  thermal: exynos: Use devm_* functions
  ARM: exynos: add thermal sensor driver platform data support
  thermal: exynos: register the tmu sensor with the kernel thermal layer
  thermal: exynos5: add exynos5250 thermal sensor driver support
  hwmon: exynos4: move thermal sensor driver to driver/thermal directory
  thermal: add generic cpufreq cooling implementation
  Fix a build error.
  thermal: Fix potential NULL pointer accesses
  thermal: add Renesas R-Car thermal sensor support
  thermal: fix potential out-of-bounds memory access
  Thermal: Introduce locking for cdev.thermal_instances list.
  Thermal: Unify the code for both active and passive cooling
  Thermal: Introduce simple arbitrator for setting device cooling state
  ...

1 files changed, 26 insertions, 0 deletions

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 3ab2bd540b54..edfd67d25013 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -19,6 +19,17 @@ config THERMAL_HWMON
         depends on HWMON=y || HWMON=THERMAL
         default y
 
+config CPU_THERMAL
+        bool "generic cpu cooling support"
+        depends on THERMAL && CPU_FREQ
+        help
+          This implements the generic cpu cooling mechanism through frequency
+          reduction, cpu hotplug and any other ways of reducing temperature. An
+          ACPI version of this already exists(drivers/acpi/processor_thermal.c).
+          This will be useful for platforms using the generic thermal interface
+          and not the ACPI interface.
+          If you want this support, you should say Y here.
+
 config SPEAR_THERMAL
         bool "SPEAr thermal sensor driver"
         depends on THERMAL
@@ -27,3 +38,18 @@ config SPEAR_THERMAL
         help
           Enable this to plug the SPEAr thermal sensor driver into the Linux
           thermal framework
+
+config RCAR_THERMAL
+        tristate "Renesas R-Car thermal driver"
+        depends on THERMAL
+        depends on ARCH_SHMOBILE
+        help
+          Enable this to plug the R-Car thermal sensor driver into the Linux
+          thermal framework
+
+config EXYNOS_THERMAL
+        tristate "Temperature sensor on Samsung EXYNOS"
+        depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) && THERMAL
+        help
+          If you say yes here you get support for TMU (Thermal Managment
+          Unit) on SAMSUNG EXYNOS series of SoC.