MAINTAINERS, .mailmap: Update Finn Thain's email address

Signed-off-by: Finn Thain <fthain@linux-m68k.org>
Link: https://lore.kernel.org/r/fc397a7074d627e22974ef8927910ad08744db5c.1621988847.git.fthain@linux-m68k.org
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/.mailmap b/.mailmap
index 3e2bff9137e918255231b3729a81c63251d5c62a..f0a0c72e5058b2cf78f6c1b9fe63187be86fe792 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -102,6 +102,7 @@ Felipe W Damasio <felipewd@terra.com.br>
 Felix Kuhling <fxkuehl@gmx.de>
 Felix Moeller <felix@derklecks.de>
 Filipe Lautert <filipe@icewall.org>
+Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
 Franck Bui-Huu <vagabon.xyz@gmail.com>
 Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
 Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index bd7aff0c120f20556547a36ba1ee47d8bfab1694..0dcf8b505da2a79deed63779bdc05ba0958f5ad7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12592,7 +12592,7 @@ S:      Orphan
 F:     drivers/net/ethernet/natsemi/natsemi.c
 
 NCR 5380 SCSI DRIVERS
-M:     Finn Thain <fthain@telegraphics.com.au>
+M:     Finn Thain <fthain@linux-m68k.org>
 M:     Michael Schmitz <schmitzmic@gmail.com>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
@@ -13064,7 +13064,7 @@ F:      Documentation/filesystems/ntfs.rst
 F:     fs/ntfs/
 
 NUBUS SUBSYSTEM
-M:     Finn Thain <fthain@telegraphics.com.au>
+M:     Finn Thain <fthain@linux-m68k.org>
 L:     linux-m68k@lists.linux-m68k.org
 S:     Maintained
 F:     arch/*/include/asm/nubus.h