Change my email address to my kernel.org account instead of the ARM one. Signed-off-by: Javi Merino <[email protected]> --- .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 <[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 b003d0ca6238..f593300e310b 100644 --- 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 <[email protected]> +M: Javi Merino <[email protected]> L: [email protected] S: Supported F: Documentation/thermal/cpu-cooling-api.txt -- 1.9.1
