aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 4b31af54ccd5..b1e9a97653dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -59,6 +59,7 @@ James Bottomley <jejb@mulgrave.(none)>
59James Bottomley <jejb@titanic.il.steeleye.com> 59James Bottomley <jejb@titanic.il.steeleye.com>
60James E Wilson <wilson@specifix.com> 60James E Wilson <wilson@specifix.com>
61James Ketrenos <jketreno@io.(none)> 61James Ketrenos <jketreno@io.(none)>
62<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
62Jean Tourrilhes <jt@hpl.hp.com> 63Jean Tourrilhes <jt@hpl.hp.com>
63Jeff Garzik <jgarzik@pretzel.yyz.us> 64Jeff Garzik <jgarzik@pretzel.yyz.us>
64Jens Axboe <axboe@suse.de> 65Jens Axboe <axboe@suse.de>