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]>

diff --git a/.mailmap b/.mailmap
index de22daefd9daecbf956d9e874aa5664355416597..1dab0a156489eb896ff37fef56cf54eddc29140f 100644 (file)
--- 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)>
+Javi Merino <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 Jean Tourrilhes <[email protected]>
 Jeff Garzik <[email protected]>

diff --git a/MAINTAINERS b/MAINTAINERS
index b003d0ca6238150479d9dc4dde79340efdb2502b..f593300e310b80f4ca41c37dd9fc038003f42a08 100644 (file)
--- 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 <javi.merino@arm.com>
+M:     Javi Merino <javi.merino@kernel.org>
 L:     [email protected]
 S:     Supported
 F:     Documentation/thermal/cpu-cooling-api.txt