From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Oct 2011 14:25:48 +0000 (+0200)
Subject: Merge branch 'for-linus' of git://github.com/gregungerer/m68knommu
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7670c7010c7b367ca40c3aba02afb36149764a6e;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://github.com/gregungerer/m68knommu

* 'for-linus' of git://github.com/gregungerer/m68knommu:
  m68k: drop unused Kconfig symbols
  m68k: drop unused Kconfig symbols
  m68knommu: create common externs for _ram* vars
  m68knommu: remove extern declarations of memory_start/memory_end from mm/init
  m68knommu: use generic section names in mm/init code
  m68knommu: use generic section names in setup code
  m68k: merge the mmu and non-mmu traps.c files
  m68k: move hardware vector setting from traps.c to its own file
  m68k: merge mmu and non-mmu include/asm/entry.h files
  m68k: merge the mmu and non-mmu kernel/Makefiles
  m68k: merge mmu and non-mmu arch Makefiles
  m68k: reorganize Kconfig options to improve mmu/non-mmu selections
  m68knommu: fix problems with SPI/GPIO on ColdFire 520x
  m68k: fix memcpy to unmatched/unaligned source and dest on 68000
---

7670c7010c7b367ca40c3aba02afb36149764a6e