Change my email address to my kernel.org account instead of the ARM one. Signed-off-by: Javi Merino <javi.mer...@arm.com> --- .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 <j...@titanic.il.steeleye.com> James E Wilson <wil...@specifix.com> James Ketrenos <jketreno@io.(none)> +Javi Merino <javi.mer...@kernel.org> <javi.mer...@arm.com> <jav...@osg.samsung.com> <javier.marti...@collabora.co.uk> Jean Tourrilhes <j...@hpl.hp.com> Jeff Garzik <jgar...@pretzel.yyz.us> 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.kach...@gmail.com> M: Viresh Kumar <viresh.ku...@linaro.org> -M: Javi Merino <javi.mer...@arm.com> +M: Javi Merino <javi.mer...@kernel.org> L: linux...@vger.kernel.org S: Supported F: Documentation/thermal/cpu-cooling-api.txt -- 1.9.1
