projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4f9a197 b2dfaa8)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Apr 2013 17:54:40 +0000 (10:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Apr 2013 17:54:40 +0000 (10:54 -0700)
commitba3b7d827e96e90e3df82695c96b3f9a666c0d82
treec491c4152ec5dcc80cf557a7562116a787024911tree | snapshot
parent4f9a197c223cc019801be948e444d05904391109commit | diff
parentb2dfaa8d33cee9dd4ed78979f5d70063df546101commit | diff
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
John Crispins staging tree