diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-28 16:37:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-28 16:37:54 -0700 |
commit | b23c1376db2dbbf784906bbcc8db81c304fa76a7 (patch) | |
tree | 1de82ec03a393dc4a312a08037d73f56a3cbc57e /MAINTAINERS | |
parent | 70cc1b5307e8ee3076fdf2ecbeb89eb973aa0ff7 (diff) | |
parent | 8ab89e9563161921ffc86724eb3217d228eaad57 (diff) |
Merge tag 'm68knommu-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"A couple of minor changes.
One to remove the long dead uclinux.org web address and email list
from the MAINTAINERS entry for UCLINUX.
The other to remove dead config options in the m68knommu Kconfig"
* tag 'm68knommu-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: Kconfig.machine: remove obsolete configs ROMBASE and ROMSIZE
MAINTAINERS: drop uclinux.org
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e3b90b2a438c..4e9370793300 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21516,10 +21516,8 @@ F: include/uapi/linux/ublk_cmd.h UCLINUX (M68KNOMMU AND COLDFIRE) M: Greg Ungerer <gerg@linux-m68k.org> L: linux-m68k@lists.linux-m68k.org -L: uclinux-dev@uclinux.org (subscribers-only) S: Maintained W: http://www.linux-m68k.org/ -W: http://www.uclinux.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git F: arch/m68k/*/*_no.* F: arch/m68k/68*/ |