X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=.mailmap;h=1ad68731fb47a9658733520c1982038cf6aaaa00;hb=3a79d52aa3c63c939f5a1f86e80e634f84e987c4;hp=df1baba43a64c7e3bab28b01ca66cbbe3e831f50;hpb=fad0701eaa091beb8ce5ef2eef04b5e833617368;p=firefly-linux-kernel-4.4.55.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>