Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: merge m68k and m68knommu arch directories
Showing
- arch/m68k/Kconfig 33 additions, 423 deletionsarch/m68k/Kconfig
- arch/m68k/Kconfig.debug 34 additions, 0 deletionsarch/m68k/Kconfig.debug
- arch/m68k/Kconfig.mmu 417 additions, 0 deletionsarch/m68k/Kconfig.mmu
- arch/m68k/Kconfig.nommu 0 additions, 94 deletionsarch/m68k/Kconfig.nommu
- arch/m68k/Makefile 3 additions, 119 deletionsarch/m68k/Makefile
- arch/m68k/Makefile_mm 121 additions, 0 deletionsarch/m68k/Makefile_mm
- arch/m68k/Makefile_no 7 additions, 9 deletionsarch/m68k/Makefile_no
- arch/m68k/configs/m5208evb_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5208evb_defconfig
- arch/m68k/configs/m5249evb_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5249evb_defconfig
- arch/m68k/configs/m5272c3_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5272c3_defconfig
- arch/m68k/configs/m5275evb_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5275evb_defconfig
- arch/m68k/configs/m5307c3_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5307c3_defconfig
- arch/m68k/configs/m5407c3_defconfig 2 additions, 0 deletionsarch/m68k/configs/m5407c3_defconfig
- arch/m68k/kernel/Makefile 3 additions, 15 deletionsarch/m68k/kernel/Makefile
- arch/m68k/kernel/Makefile_mm 17 additions, 0 deletionsarch/m68k/kernel/Makefile_mm
- arch/m68k/kernel/Makefile_no 0 additions, 0 deletionsarch/m68k/kernel/Makefile_no
- arch/m68k/kernel/asm-offsets.c 3 additions, 98 deletionsarch/m68k/kernel/asm-offsets.c
- arch/m68k/kernel/asm-offsets_mm.c 100 additions, 0 deletionsarch/m68k/kernel/asm-offsets_mm.c
- arch/m68k/kernel/asm-offsets_no.c 0 additions, 0 deletionsarch/m68k/kernel/asm-offsets_no.c
- arch/m68k/kernel/dma.c 5 additions, 130 deletionsarch/m68k/kernel/dma.c
Loading
Please register or sign in to comment