• 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...
    b29bdba5
MAINTAINERS 248 KB