X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=.mailmap;h=d410bcdd94aab3b0485b3623a0c292cc53071304;hb=38b8767462120c62a5046b529c80b06861f9ac85;hp=de22daefd9daecbf956d9e874aa5664355416597;hpb=e45eeb43e67669f130c270a325383769d5fd73e2;p=cascardo%2Flinux.git

diff --git a/.mailmap b/.mailmap
index de22daefd9da..d410bcdd94aa 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>
@@ -124,6 +125,7 @@ Peter Oruba <peter@oruba.de>
 Peter Oruba <peter.oruba@amd.com>
 Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
 Praveen BP <praveenbp@ti.com>
+Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
 Rajesh Shah <rajesh.shah@intel.com>
 Ralf Baechle <ralf@linux-mips.org>
 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>