X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=.mailmap;h=1dab0a156489eb896ff37fef56cf54eddc29140f;hb=be67d60ba944bdd38571b79bdcd506e34c0f16c1;hp=de22daefd9daecbf956d9e874aa5664355416597;hpb=2c937eb4ddca946bb74936cf63aba0f94aa0efb3;p=deliverable%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>