• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · b29bdba5
    Linus Torvalds authored
    Pull thermal management update from Zhang Rui:
     "The most important one is to build thermal core and governor and cpu
      cooling code into one module.  This fixes a regression that thermal
      core does not work if it is built as module, since 3.7.  I'll backport
      them to stable kernel once those changes are in upstream.
    
      The largest batch is the thermal kernel-doc & coding style
      updates/cleanups from Eduardo.
    
      Highlights:
    
       - build all thermal framework code into one module to fix a
         regression that thermal does not work if it is built as module.
    
       - Marvell Armada 370/XP thermal sensor driver
    
       - thermal core/cpu cooling kernel-doc & coding style updates and
         cleanups.
    
       - Add Eduardo Valentin as thermal sub-maintainer, both in mailing
         list and patchwork.  He will help me on arm thermal drivers."
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (68 commits)
      thermal: db8500_cpufreq_cooling: remove usage of IS_ERR_OR_NULL()
      thermal: thermal_core: remove usage of IS_ERR_OR_NULL
      thermal: cpu_cooling: improve line breaking
      thermal: cpu_cooling: alignment improvements
      thermal: cpu_cooling: remove checkpatch.pl warning
      thermal: cpu_cooling: remove trailing blank line
      thermal: cpu_cooling: align on open parenthesis
      thermal: cpu_cooling: standardize comment style
      thermal: cpu_cooling: standardize end of function
      thermal: cpu_cooling: remove trailing white spaces
      Thermal: update documentation for thermal_zone_device_register
      thermal: update kernel-doc for thermal_zone_device_register
      thermal: update kernel-doc for create_trip_attrs
      thermal: update kernel-doc for thermal_cooling_device_register
      thermal: update kernel-doc for thermal_zone_unbind_cooling_device
      thermal: update kernel-doc for thermal_zone_bind_cooling_device
      thermal: use EXPORT_SYMBOL_GPL
      thermal: rename notify_thermal_framework to thermal_notify_framework
      thermal: update driver license
      thermal: use strlcpy instead of strcpy
      ...
    b29bdba5
MAINTAINERS 248 KB