[PATCH] MAINTAINERS: Switch to kernel.org email address for Javi Merino

[Javi Merino]

Change my email address to my kernel.org account instead of the ARM one.

Signed-off-by: Javi Merino <javi.merino@xxxxxxx>
---
 .mailmap    | 1 +
 MAINTAINERS | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 <jejb@xxxxxxxxxxxxxxxxxxxxxxx>
 James E Wilson <wilson@xxxxxxxxxxxx>
 James Ketrenos <jketreno@io.(none)>
+Javi Merino <javi.merino@xxxxxxxxxx> <javi.merino@xxxxxxx>
 <javier@xxxxxxxxxxxxxxx> <javier.martinez@xxxxxxxxxxxxxxx>
 Jean Tourrilhes <jt@xxxxxxxxxx>
 Jeff Garzik <jgarzik@xxxxxxxxxxxxxx>
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@xxxxxxxxx>
 M:	Viresh Kumar <viresh.kumar@xxxxxxxxxx>
-M:	Javi Merino <javi.merino@xxxxxxx>
+M:	Javi Merino <javi.merino@xxxxxxxxxx>
 L:	linux-pm@xxxxxxxxxxxxxxx
 S:	Supported
 F:	Documentation/thermal/cpu-cooling-api.txt
-- 
1.9.1