aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2013-04-27 08:48:57 -0400
committerZhang Rui <rui.zhang@intel.com>2013-04-27 08:48:57 -0400
commitde6558dc964f6a3243218f17d8032ad810864e2b (patch)
tree7ad5494dee620df39aedd05348129f223a1d3bab
parent8f578bfefdd13d28d5baf3345405c46b101fe2f5 (diff)
parentcfaf71792d052dcbae379ce1ed6d11b8ce8ebab4 (diff)
Merge branch 'MAINTAINERS-update' of .git into next
-rw-r--r--MAINTAINERS3
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4cf5fd334a06..743d540f5db4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7898,11 +7898,14 @@ F: arch/xtensa/
7898 7898
7899THERMAL 7899THERMAL
7900M: Zhang Rui <rui.zhang@intel.com> 7900M: Zhang Rui <rui.zhang@intel.com>
7901M: Eduardo Valentin <eduardo.valentin@ti.com>
7901L: linux-pm@vger.kernel.org 7902L: linux-pm@vger.kernel.org
7902T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git 7903T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
7904Q: https://patchwork.kernel.org/project/linux-pm/list/
7903S: Supported 7905S: Supported
7904F: drivers/thermal/ 7906F: drivers/thermal/
7905F: include/linux/thermal.h 7907F: include/linux/thermal.h
7908F: include/linux/cpu_cooling.h
7906 7909
7907THINGM BLINK(1) USB RGB LED DRIVER 7910THINGM BLINK(1) USB RGB LED DRIVER
7908M: Vivien Didelot <vivien.didelot@savoirfairelinux.com> 7911M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>