diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-28 14:01:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-28 14:01:03 -0700 |
| commit | 17cfb9d332243f6d2551818df27d666d3dd70a23 (patch) | |
| tree | 2065b5335cf2f17eea5b4d34bf25c7cee1c5a8df /MAINTAINERS | |
| parent | Merge tag 'x86-splitlock-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning (diff) | |
| download | linux-dev-17cfb9d332243f6d2551818df27d666d3dd70a23.tar.xz linux-dev-17cfb9d332243f6d2551818df27d666d3dd70a23.zip | |
Merge tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- update Finn's email address in MAINTAINERS
- defconfig updates
- minor fixes and improvements
* tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning
m68k: defconfig: Update defconfigs for v5.13-rc1
MAINTAINERS, .mailmap: Update Finn Thain's email address
m68k: dma: Remove unnecessary include of asm/cacheflush.h
m68k: Drop -fno-strength-reduce from KBUILD_CFLAGS
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4289f9396f03..36cdd37f6669 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12598,7 +12598,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 @@ -13070,7 +13070,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 |