From 78615aaf3c411e02cd528884f821b0072156ee87 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Thu, 15 Nov 2012 08:58:27 +0800 Subject: [PATCH] --- yaml --- r: 335738 b: refs/heads/master c: d3fb695576fc7f9d045da9e1ef001d94b0eea3cb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 49c6d12fd34c..cbc82eb95c6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa0cbbf145aabbf29c6f28f8a11935c0b0fd86fc +refs/heads/master: d3fb695576fc7f9d045da9e1ef001d94b0eea3cb diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index ff8e763eaa50..bb0b27db673f 100644 --- 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 +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 L: ibm-acpi-devel@lists.sourceforge.net