---

yaml --- r: 335738 b: refs/heads/master c: d3fb695 h: refs/heads/master v: v3
git-mirror · Nov 16, 2012 · 78615aa · 78615aa
1 parent d2c9e4c
commit 78615aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa0cbbf145aabbf29c6f28f8a11935c0b0fd86fc
+refs/heads/master: d3fb695576fc7f9d045da9e1ef001d94b0eea3cb
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -7259,6 +7259,14 @@ L:	linux-xtensa@linux-xtensa.org
 S:	Maintained
 F:	arch/xtensa/
 
+THERMAL
+M:      Zhang Rui <rui.zhang@intel.com>
+L:      linux-pm@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
+S:      Supported
+F:      drivers/thermal/
+F:      include/linux/thermal.h
+
 THINKPAD ACPI EXTRAS DRIVER
 M:	Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
 L:	ibm-acpi-devel@lists.sourceforge.net