projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ea31c5 cf6c31f)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Jun 2013 18:50:17 +0000 (11:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Jun 2013 18:50:17 +0000 (11:50 -0700)
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


Trivial merge
John Crispins staging tree