From: Nicolas Ferre <nicolas.ferre@microchip.com>
Date: Fri, 23 Aug 2019 08:31:58 +0000 (+0200)
Subject: mailmap: map old company name to new one @microchip.com
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2cb831e0f152e483ab797b44787a4ff426267fbc;p=linux.git

mailmap: map old company name to new one @microchip.com

Map my old email address @atmel.com to my new company name. It happened 3
years ago but I realized the existence of this file recently.

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20190823083158.2649-3-nicolas.ferre@microchip.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/.mailmap b/.mailmap
index 0fef932de3dba..80be83cff32af 100644
--- a/.mailmap
+++ b/.mailmap
@@ -170,6 +170,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>