Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 06930b94
    Linus Torvalds authored
    Pull m68knommu tree from Greg Ungerer:
     "More merge and clean up of MMU and non-MMU common files, namely
      signal.c and dma.c.  There is also a simplification of the ColdFire
      GPIO setup tables.  Using a couple of simple macros we make the init
      tables really small and easy to read, and save a couple of thousand
      lines of code.  Also a move of all the ColdFire subarch support files
      into the existing coldfire directory.  The sub-directories just ended
      up duplicating Makefiles and now only contain really simple pieces of
      code.  This saves quite a few lines of code too.
    
      As always a couple of bugs fixes thrown in too.  Oh and a new
      defconfig for the ColdFire platforms that support having the MMU
      enabled."
    
    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (39 commits)
      m68k: add a defconfig for the M5475EVB ColdFire with MMU board
      m68knommu: unaligned.h fix for M68000 core
      m68k: merge the MMU and non-MMU versions of the arch dma code
      m68knommu: reorganize the no-MMU cache flushing to match m68k
      m68knommu: move the 54xx platform code into the common ColdFire code directory
      m68knommu: move the 532x platform code into the common ColdFire code directory
      m68knommu: move the 5407 platform code into the common ColdFire code directory
      m68knommu: move the 5307 platform code into the common ColdFire code directory
      m68knommu: move the 528x platform code into the common ColdFire code directory
      m68knommu: move the 527x platform code into the common ColdFire code directory
      m68knommu: move the 5272 platform code into the common ColdFire code directory
      m68knommu: move the 5249 platform code into the common ColdFire code directory
      m68knommu: move the 523x platform code into the common ColdFire code directory
      m68knommu: move the 520x platform code into the common ColdFire code directory
      m68knommu: move the 5206 platform code into the common ColdFire code directory
      m68knommu: simplify the ColdFire 5407 GPIO struct setup
      m68knommu: simplify the ColdFire 532x GPIO struct setup
      m68knommu: simplify the ColdFire 5307 GPIO struct setup
      m68knommu: simplify the ColdFire 528x GPIO struct setup
      m68knommu: simplify the ColdFire 527x GPIO struct setup
      ...
    06930b94