aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavi Merino <[email protected]>2016-09-30 13:14:28 +0100
committerLinus Torvalds <[email protected]>2016-09-30 10:45:11 -0700
commit9a2172a8d52cf14ce44e9cadd8c9df84cf832d75 (patch)
treebbccf78193273c745021ffa328a4117287e0616f
parente3b3656ca63e23b5755183718df36fb9ff518b02 (diff)
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 <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS2
2 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index de22daefd9da..1dab0a156489 100644
--- a/.mailmap
+++ b/.mailmap
@@ -69,6 +69,7 @@ James Bottomley <jejb@mulgrave.(none)>
James Bottomley <[email protected]>
James E Wilson <[email protected]>
James Ketrenos <jketreno@io.(none)>
Jean Tourrilhes <[email protected]>
Jeff Garzik <[email protected]>
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 <[email protected]>
M: Viresh Kumar <[email protected]>
-M: Javi Merino <[email protected]>
+M: Javi Merino <[email protected]>
S: Supported
F: Documentation/thermal/cpu-cooling-api.txt