From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Apr 2015 17:12:29 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: firefly_0821_release~176^2~1919
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5ca08a82a75c9109f8207cbcbef8705334b4713a;p=firefly-linux-kernel-4.4.55.git

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
---

5ca08a82a75c9109f8207cbcbef8705334b4713a