From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Apr 2013 17:54:40 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ba3b7d827e96e90e3df82695c96b3f9a666c0d82;p=openwrt%2Fstaging%2Fblogic.git

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

Pull m68knommu fix from Greg Ungerer:
 "This contains only a single compilation fix for ColdFire m68k targets
  that use local non-GPIOLIB support."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: define a local gpio_request_one() function
---

ba3b7d827e96e90e3df82695c96b3f9a666c0d82