aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-09 12:40:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-09 12:40:49 -0400
commitb29bdba51924f6fd5971352ba111784dee3a5853 (patch)
tree95f8b7adfd75ce1d6c86b06f9347247aefecd075 /MAINTAINERS
parente0fd9affeb64088eff407dfc98bbd3a5c17ea479 (diff)
parentde6558dc964f6a3243218f17d8032ad810864e2b (diff)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
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 ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5f5c895e6621..3d7782b9f90d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8029,11 +8029,14 @@ F: arch/xtensa/
8029 8029
8030THERMAL 8030THERMAL
8031M: Zhang Rui <rui.zhang@intel.com> 8031M: Zhang Rui <rui.zhang@intel.com>
8032M: Eduardo Valentin <eduardo.valentin@ti.com>
8032L: linux-pm@vger.kernel.org 8033L: linux-pm@vger.kernel.org
8033T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git 8034T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
8035Q: https://patchwork.kernel.org/project/linux-pm/list/
8034S: Supported 8036S: Supported
8035F: drivers/thermal/ 8037F: drivers/thermal/
8036F: include/linux/thermal.h 8038F: include/linux/thermal.h
8039F: include/linux/cpu_cooling.h
8037 8040
8038THINGM BLINK(1) USB RGB LED DRIVER 8041THINGM BLINK(1) USB RGB LED DRIVER
8039M: Vivien Didelot <vivien.didelot@savoirfairelinux.com> 8042M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>