]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
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)
commit17d8dfcda6ce570ddc4844f490104fed4af215aa
treefb56667cfc94545a6907d0ba5bf0df4adadd20e7
parent6ea31c56a54ef79b46b56ad35a308db474d600d3
parentcf6c31fc5c3de225348742c95cc6185fca20a2f2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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