• Linus Torvalds's avatar
    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 50851c62
    Linus Torvalds authored
    Pull thermal management update from Zhang Rui:
     "Highlights:
    
       - Introduction of thermal policy support, together with three new
         thermal governors, including step_wise, user_space, fire_share.
    
       - Introduction of ST-Ericsson db8500_thermal driver and ST-Ericsson
         db8500_cpufreq_cooling driver.
    
       - Thermal Kconfig file and Makefile refactor.
    
       - Fixes for generic thermal layer, generic cpucooling, rcar thermal
         driver and Exynos thermal driver."
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (36 commits)
      Thermal: Fix DEFAULT_THERMAL_GOVERNOR
      Thermal: fix a NULL pointer dereference when generic thermal layer is built as a module
      thermal: rcar: add rcar_zone_to_priv() macro
      thermal: rcar: fixup the unit of temperature
      thermal: cpu cooling: allow module builds
      thermal: cpu cooling: use const parameter while registering
      Thermal: Add ST-Ericsson DB8500 thermal properties and platform data.
      Thermal: Add ST-Ericsson DB8500 thermal driver.
      drivers/thermal/Makefile refactor
      Exynos: Add missing dependency
      Refactor drivers/thermal/Kconfig
      thermal: cpu_cooling: Make 'notify_device' static
      Thermal: Remove the cooling_cpufreq_list.
      Thermal: fix bug of counting cpu frequencies.
      Thermal: add indent for code alignment.
      thermal: rcar_thermal: remove explicitly used devm_kfree/iounap()
      thermal: user_space: Add missing static storage class specifiers
      thermal: fair_share: Add missing static storage class specifiers
      thermal: step_wise: Add missing static storage class specifiers
      Thermal: Fix oops and unlocking in thermal_sys.c
      ...
    50851c62
thermal.c 31.6 KB