Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/math-emu: Remove unnecessary code m68k/math-emu: Remove commented out old code m68k: Kill warning in setup_arch() when compiling for Sun3 m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_ sparc: iounmap() and *_free_coherent() - Use lookup_resource() m68k/atari: Reserve some ST-RAM early on for device buffer use m68k/amiga: Chip RAM - Use lookup_resource() resources: Add lookup_resource() sparc: _sparc_find_resource() should check for exact matches m68k/amiga: Chip RAM - Offset resource end by CHIP_PHYSADDR m68k/amiga: Chip RAM - Use resource_size() to fix off-by-one error m68k/amiga: Chip RAM - Change chipavail to an atomic_t m68k/amiga: Chip RAM - Always allocate from the start of memory m68k/amiga: Chip RAM - Convert from printk() to pr_*() m68k/amiga: Chip RAM - Use tabs for indentation
Showing
- arch/m68k/Kconfig.mmu 0 additions, 6 deletionsarch/m68k/Kconfig.mmu
- arch/m68k/amiga/chipram.c 63 additions, 73 deletionsarch/m68k/amiga/chipram.c
- arch/m68k/atari/stram.c 69 additions, 285 deletionsarch/m68k/atari/stram.c
- arch/m68k/include/asm/atari_stram.h 1 addition, 2 deletionsarch/m68k/include/asm/atari_stram.h
- arch/m68k/include/asm/atarihw.h 2 additions, 2 deletionsarch/m68k/include/asm/atarihw.h
- arch/m68k/kernel/setup_mm.c 2 additions, 0 deletionsarch/m68k/kernel/setup_mm.c
- arch/m68k/math-emu/fp_log.c 0 additions, 3 deletionsarch/m68k/math-emu/fp_log.c
- arch/m68k/math-emu/multi_arith.h 0 additions, 530 deletionsarch/m68k/math-emu/multi_arith.h
- arch/m68k/mm/init_mm.c 0 additions, 5 deletionsarch/m68k/mm/init_mm.c
- arch/sparc/kernel/ioport.c 7 additions, 25 deletionsarch/sparc/kernel/ioport.c
- include/linux/ioport.h 1 addition, 0 deletionsinclude/linux/ioport.h
- kernel/resource.c 21 additions, 0 deletionskernel/resource.c
Loading
Please register or sign in to comment