From: Javi Merino <javi.merino@xxxxxxx> Subject: MAINTAINERS: Javi has moved Change my email address to my kernel.org account instead of the ARM one. Link: http://lkml.kernel.org/r/1475237668-8408-1-git-send-email-javi.merino@xxxxxxx Signed-off-by: Javi Merino <javi.merino@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- .mailmap | 1 + MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff -puN .mailmap~maintainers-switch-to-kernelorg-email-address-for-javi-merino .mailmap --- a/.mailmap~maintainers-switch-to-kernelorg-email-address-for-javi-merino +++ a/.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 -puN MAINTAINERS~maintainers-switch-to-kernelorg-email-address-for-javi-merino MAINTAINERS --- a/MAINTAINERS~maintainers-switch-to-kernelorg-email-address-for-javi-merino +++ a/MAINTAINERS @@ -11626,7 +11626,7 @@ F: Documentation/devicetree/bindings/the 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 _ -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
