summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJavi Merino <javi.merino@arm.com>2016-09-30 13:14:28 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-30 10:45:11 -0700
commit9a2172a8d52cf14ce44e9cadd8c9df84cf832d75 (patch)
treebbccf78193273c745021ffa328a4117287e0616f /.mailmap
parente3b3656ca63e23b5755183718df36fb9ff518b02 (diff)
downloadlinux-next-9a2172a8d52cf14ce44e9cadd8c9df84cf832d75.tar.gz
MAINTAINERS: Switch to kernel.org email address for Javi Merino
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>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
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@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>