X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=.mailmap;h=ae2bcad06f4b58eb3db18020df75cabeb59b6ed0;hb=25cce03b1d06e4b742f6dafdda2f4d80c13bdc18;hp=b2cde8668dcc38f85c6f0f1bac9da5fa2e9f63b9;hpb=590627f755bc385bd2b2fbd87de312a462889222;p=uclinux-h8%2Flinux.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>