MAINTAINERS: Switch to kernel.org email address for Javi Merino
authorJavi Merino <javi.merino@arm.com>
Fri, 30 Sep 2016 12:14:28 +0000 (13:14 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2016 17:45:11 +0000 (10:45 -0700)
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>
.mailmap
MAINTAINERS

index de22daefd9daecbf956d9e874aa5664355416597..1dab0a156489eb896ff37fef56cf54eddc29140f 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -69,6 +69,7 @@ James Bottomley <jejb@mulgrave.(none)>
 James Bottomley <jejb@titanic.il.steeleye.com>
 James E Wilson <wilson@specifix.com>
 James Ketrenos <jketreno@io.(none)>
+Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
 <javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
 Jean Tourrilhes <jt@hpl.hp.com>
 Jeff Garzik <jgarzik@pretzel.yyz.us>
index b003d0ca6238150479d9dc4dde79340efdb2502b..f593300e310b80f4ca41c37dd9fc038003f42a08 100644 (file)
@@ -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