X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=.mailmap;h=1ad68731fb47a9658733520c1982038cf6aaaa00;hb=0de9d2ebe590f9203dac59d4b8e298c473764b92;hp=df1baba43a64c7e3bab28b01ca66cbbe3e831f50;hpb=5235cd21212ca3701b678d7e93682999a772c995;p=linux-2.6-microblaze.git

diff --git a/.mailmap b/.mailmap
index df1baba43a64..1ad68731fb47 100644
--- a/.mailmap
+++ b/.mailmap
@@ -62,6 +62,11 @@ Jeff Garzik <jgarzik@pretzel.yyz.us>
 Jens Axboe <axboe@suse.de>
 Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
 John Stultz <johnstul@us.ibm.com>
+<josh@joshtriplett.org> <josh@freedesktop.org>
+<josh@joshtriplett.org> <josh@kernel.org>
+<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
+<josh@joshtriplett.org> <josht@us.ibm.com>
+<josh@joshtriplett.org> <josht@vnet.ibm.com>
 Juha Yrjola <at solidboot.com>
 Juha Yrjola <juha.yrjola@nokia.com>
 Juha Yrjola <juha.yrjola@solidboot.com>