X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=.mailmap;h=ae2bcad06f4b58eb3db18020df75cabeb59b6ed0;hb=8f05a7953560681cde94b864d1b495cc1a0f1aad;hp=b2cde8668dcc38f85c6f0f1bac9da5fa2e9f63b9;hpb=6536c5f2c8cf79db0d37e79afcdb227dc854509c;p=linux-2.6-block.git

diff --git a/.mailmap b/.mailmap
index b2cde8668dcc..ae2bcad06f4b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -156,6 +156,8 @@ Morten Welinder <welinder@darter.rentec.com>
 Morten Welinder <welinder@troll.com>
 Mythri P K <mythripk@ti.com>
 Nguyen Anh Quynh <aquynh@gmail.com>
+Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
+Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
 Patrick Mochel <mochel@digitalimplant.org>
 Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>