summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-09 10:59:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-09 10:59:00 -0800
commit316eaf170252f3b50e0d7d5d17ac1f0ee8ae70ef (patch)
tree346789e9dd80710a330f2b2e8ef17e2a3f2d1385 /MAINTAINERS
parente42617b825f8073569da76dc4510bfa019b1c35a (diff)
parent6e456dca47c5e3b8d8c6bbc4edd1377985d793b5 (diff)
downloadlinux-316eaf170252f3b50e0d7d5d17ac1f0ee8ae70ef.tar.gz
linux-316eaf170252f3b50e0d7d5d17ac1f0ee8ae70ef.tar.bz2
linux-316eaf170252f3b50e0d7d5d17ac1f0ee8ae70ef.zip
Merge tag 'thermal-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux
Pull thermal fixes from Zhang Rui: "Starting from this release cycle, we have Daniel Lezcano work as the new thermal co-maintainer because Eduardo's email is bouncing for sometime and we can not reach him. We also have a new shared git tree so that both Daniel and I can actively working on it. Specifics: - Update MAINTAINER file for new thermal co-maintainer and new thermal git tree address. (Daniel Lezcano, Florian Fainelli, Zhang Rui) - Fix a Kconfig warning. (YueHaibing)" * tag 'thermal-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: MAINTAINERS: thermal: Change the git tree location MAINTAINERS: thermal: Add Daniel Lezcano as the thermal maintainer MAINTAINERS: thermal: Eduardo's email is bouncing thermal: power_allocator: Fix Kconfig warning
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bd5847e802de..02d5278a4c9a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16314,12 +16314,10 @@ F: drivers/media/radio/radio-raremono.c
THERMAL
M: Zhang Rui <rui.zhang@intel.com>
-M: Eduardo Valentin <edubezval@gmail.com>
-R: Daniel Lezcano <daniel.lezcano@linaro.org>
+M: Daniel Lezcano <daniel.lezcano@linaro.org>
R: Amit Kucheria <amit.kucheria@verdurent.com>
L: linux-pm@vger.kernel.org
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
Q: https://patchwork.kernel.org/project/linux-pm/list/
S: Supported
F: drivers/thermal/