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]>
opendata26 · Sep 30, 2016 · 9a2172a · 9a2172a
1 parent e3b3656
commit 9a2172a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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