diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-14 16:20:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-14 16:20:48 -0800 |
| commit | 0b03beface02d519693edb8020f9811c67d5c88f (patch) | |
| tree | e69b63da6b4fa28fd70205187c699aecf1b1128e /MAINTAINERS | |
| parent | 2c075f38a708c578a752b738a45e8c26923eac2e (diff) | |
| parent | 2ae92e8b9b7eb042ccb7e9fc7ea9431f211a1bd3 (diff) | |
Merge tag 'm68k-for-v5.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- fix WARNING splat in pmac_zilog driver
- fix ADB input device regression
- assume maintainership for adb-iop and via-macii
- minor fixes and improvements
- defconfig updates
* tag 'm68k-for-v5.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
MAINTAINERS: Update m68k Mac entry
macintosh/adb-iop: Send correct poll command
macintosh/adb-iop: Always wait for reply message from IOP
m68k: Fix WARNING splat in pmac_zilog driver
m68k: Add a missing ELF_DETAILS in link script
m68k: Drop redundant NOTES in link script
m68k: mac: Update Kconfig help
m68k: mac: Remove redundant VIA register writes
m68k: mac: Remove dead code
m68k: mac: Refactor iop_preinit() and iop_init()
m68k: defconfig: Enable KUnit tests
m68k: defconfig: Update defconfigs for v5.10-rc1
m68k: Remove unused mach_max_dma_address
m68k: Avoid xchg() warning
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2bdd87123060..da7817c48286 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10426,6 +10426,8 @@ L: linux-m68k@lists.linux-m68k.org S: Maintained W: http://www.mac.linux-m68k.org/ F: arch/m68k/mac/ +F: drivers/macintosh/adb-iop.c +F: drivers/macintosh/via-macii.c M68K ON HP9000/300 M: Philip Blundell <philb@gnu.org> |