summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@microchip.com>2019-08-23 10:31:58 +0200
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2019-08-23 21:53:40 +0200
commit2cb831e0f152e483ab797b44787a4ff426267fbc (patch)
tree338c5f30ba7b53a75527045c9861488ef9e53e47 /.mailmap
parentMAINTAINERS: at91: remove the TC entry (diff)
downloadlinux-2cb831e0f152e483ab797b44787a4ff426267fbc.tar.xz
linux-2cb831e0f152e483ab797b44787a4ff426267fbc.zip
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>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 0fef932de3db..80be83cff32a 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>