Merge tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull m68knommu updates from Greg Ungerer:

 - cleanup of 68328 code

 - align BSS section to 32bit

* tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: m68328: remove duplicate code
  m68k: m68328: move platform code to separate files
  m68knommu: align BSS section to 4-byte boundaries

diff --cc arch/m68k/Kconfig.cpu
index 7246aa50298eedaa0200c41fedf07676ed836417,a65ce761823262cf001d8d5814e66ca656ba6004..f4d23977d2a5a4e03bec8e6d69cf4e24182a4ed7
--- 1/arch/m68k/Kconfig.cpu
--- 2/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@@ -103,25 -102,22 +103,25 @@@ config M6806
          processor, say Y. Otherwise, say N.
  
  config M68328
-       bool "MC68328"
+       bool
        depends on !MMU
 +      select LEGACY_TIMER_TICK
        select M68000
        help
          Motorola 68328 processor support.
  
  config M68EZ328
-       bool "MC68EZ328"
+       bool
        depends on !MMU
 +      select LEGACY_TIMER_TICK
        select M68000
        help
          Motorola 68EX328 processor support.
  
  config M68VZ328
-       bool "MC68VZ328"
+       bool
        depends on !MMU
 +      select LEGACY_TIMER_TICK
        select M68000
        help
          Motorola 68VZ328 processor support.

diff --cc arch/m68k/Kconfig.machine
Simple merge

diff --cc arch/m68k/kernel/setup_no.c
Simple merge

diff --cc arch/m68k/kernel/vmlinux-nommu.lds
Simple merge