Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Apr 2015 17:12:29 +0000 (10:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Apr 2015 17:12:29 +0000 (10:12 -0700)
commit5ca08a82a75c9109f8207cbcbef8705334b4713a
tree5829fcfb3c79b28f80308d19ea11eb64d6d416e5
parentf4d03bd143c628b00f66cc2ec2c013767bdd1518
parent6e4206136faa9a4d588946dfa604e1d989a9b3b6
Merge branch 'for-next' of git://git./linux/kernel/git/gerg/m68knommu

Pull m68k fixes from Greg Ungerer:
 "Nothing big, spelling fixes and fix/cleanup for ColdFire eth device setup"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix fec setup warning for ColdFire 5271 builds
  m68knommu: ColdFire 5271 only has a single FEC controller
  m68k: Fix trivial typos in comments