Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 968e75fc
    Linus Torvalds authored
    * '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
    968e75fc