aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJavi Merino <javi.merino@arm.com>2016-09-30 13:14:28 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-30 10:45:11 -0700
commit9a2172a8d52cf14ce44e9cadd8c9df84cf832d75 (patch)
treebbccf78193273c745021ffa328a4117287e0616f /MAINTAINERS
parente3b3656ca63e23b5755183718df36fb9ff518b02 (diff)
downloadlinux-stericsson-9a2172a8d52cf14ce44e9cadd8c9df84cf832d75.tar.gz
MAINTAINERS: Switch to kernel.org email address for Javi Merino
Change my email address to my kernel.org account instead of the ARM one. Signed-off-by: Javi Merino <javi.merino@arm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b003d0ca6238..f593300e310b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11626,7 +11626,7 @@ F: Documentation/devicetree/bindings/thermal/
THERMAL/CPU_COOLING
M: Amit Daniel Kachhap <amit.kachhap@gmail.com>
M: Viresh Kumar <viresh.kumar@linaro.org>
-M: Javi Merino <javi.merino@arm.com>
+M: Javi Merino <javi.merino@kernel.org>
L: linux-pm@vger.kernel.org
S: Supported
F: Documentation/thermal/cpu-cooling-api.txt