Merge tag 'omap-for-v5.4/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index acba1a6163f1b1e86ab78066b52d2e86887d9314..255a149e6c2321bade8a9cf6e7f06c8f452ea075 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -173,6 +173,7 @@ Morten Welinder <welinder@darter.rentec.com>
 Morten Welinder <welinder@troll.com>
 Mythri P K <mythripk@ti.com>
 Nguyen Anh Quynh <aquynh@gmail.com>
+Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
 Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
 Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>