]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'm68knommu-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Apr 2023 23:37:54 +0000 (16:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Apr 2023 23:37:54 +0000 (16:37 -0700)
commitb23c1376db2dbbf784906bbcc8db81c304fa76a7
tree1de82ec03a393dc4a312a08037d73f56a3cbc57e
parent70cc1b5307e8ee3076fdf2ecbeb89eb973aa0ff7
parent8ab89e9563161921ffc86724eb3217d228eaad57
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
MAINTAINERS
arch/m68k/Kconfig.machine