summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-09-03 14:23:43 +0200
committerArnd Bergmann <arnd@arndb.de>2019-09-03 14:23:44 +0200
commit7bbf8693103589936570e241db4ebf7beee55568 (patch)
tree44f538cb3ad327a79341df812a47e6a49a196eae /.mailmap
parente6dde5cc391c73c8915f72c83e50c3973f6afe27 (diff)
parent2cb831e0f152e483ab797b44787a4ff426267fbc (diff)
downloadlinux-7bbf8693103589936570e241db4ebf7beee55568.tar.bz2
Merge tag 'at91-5.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/soc
AT91 SoC for 5.4 - MAINTAINERS updates - a generated headers parallel build fix * tag 'at91-5.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: mailmap: map old company name to new one @microchip.com MAINTAINERS: at91: remove the TC entry MAINTAINERS: at91: Collect all pinctrl/gpio drivers in same entry ARM: at91: move platform-specific asm-offset.h to arch/arm/mach-at91 Link: https://lore.kernel.org/r/20190825203222.GA22800@piout.net Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index acba1a6163f1..255a149e6c23 100644
--- 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>