Merge branch 'MAINTAINERS-update' of .git into next

de6558dc · Zhang Rui · 8f578bfe · cfaf7179 · de6558dc
Commit de6558dc authored Apr 27, 2013 by Zhang Rui
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

MAINTAINERS MAINTAINERS +3 -0

No files found.
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7898,11 +7898,14 @@ F:	arch/xtensa/

 THERMAL
 M:      Zhang Rui <rui.zhang@intel.com>
+M:      Eduardo Valentin <eduardo.valentin@ti.com>
 L:      linux-pm@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
+Q:      https://patchwork.kernel.org/project/linux-pm/list/
 S:      Supported
 F:      drivers/thermal/
 F:      include/linux/thermal.h
+F:      include/linux/cpu_cooling.h

 THINGM BLINK(1) USB RGB LED DRIVER
 M:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>