From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Jun 2013 18:50:17 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: firefly_0821_release~3680^2~344
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=17d8dfcda6ce570ddc4844f490104fed4af215aa;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/gerg/m68knommu

Pull m68knommu fix from Greg Ungerer:
 "A single fix for compilation breakage to many of the ColdFire CPU
  targets"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: only use local gpio_request_one if not using GPIOLIB
---

17d8dfcda6ce570ddc4844f490104fed4af215aa