X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=.mailmap;h=825fae8e6b7bd56ce75561ef54a66110c7f1b8f7;hb=901fc8e8079e401f3240006cab6629e65579701c;hp=9ba38a82aba42009746034031cb08700f6ed7491;hpb=1888e9b4bb78c88514b24ecafa9e4e4faf761747;p=linux-2.6-microblaze.git

diff --git a/.mailmap b/.mailmap
index 9ba38a82aba4..825fae8e6b7b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -201,6 +201,8 @@ Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
 <josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
 <josh@joshtriplett.org> <josht@us.ibm.com>
 <josh@joshtriplett.org> <josht@vnet.ibm.com>
+Josh Poimboeuf <jpoimboe@kernel.org> <jpoimboe@redhat.com>
+Josh Poimboeuf <jpoimboe@kernel.org> <jpoimboe@us.ibm.com>
 Juha Yrjola <at solidboot.com>
 Juha Yrjola <juha.yrjola@nokia.com>
 Juha Yrjola <juha.yrjola@solidboot.com>