X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=.mailmap;h=1dab0a156489eb896ff37fef56cf54eddc29140f;hb=21f54ddae449f4bdd9f1498124901d67202243d9;hp=de22daefd9daecbf956d9e874aa5664355416597;hpb=8ff77206aa36949afab46be43a3d14af75a4e270;p=cascardo%2Flinux.git

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>