Merge branch 'thermal/next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 061d59a..ec1565d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13688,6 +13688,7 @@ L:      linux-pm@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     drivers/thermal/qcom/
+F:     Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
 
 QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
 M:     Stanimir Varbanov <stanimir.varbanov@linaro.org>
@@ -16310,6 +16311,15 @@ F:     Documentation/driver-api/thermal/cpu-cooling-api.rst
 F:     drivers/thermal/cpu_cooling.c
 F:     include/linux/cpu_cooling.h
 
+THERMAL DRIVER FOR AMLOGIC SOCS
+M:     Guillaume La Roque <glaroque@baylibre.com>
+L:     linux-pm@vger.kernel.org
+L:     linux-amlogic@lists.infradead.org
+W:     http://linux-meson.com/
+S:     Supported
+F:     drivers/thermal/amlogic_thermal.c
+F:     Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml
+
 THINKPAD ACPI EXTRAS DRIVER
 M:     Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
 L:     ibm-acpi-devel@lists.sourceforge.net