| commit | 17d8dfcda6ce570ddc4844f490104fed4af215aa | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 08 11:50:17 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 08 11:50:17 2013 -0700 |
| tree | fb56667cfc94545a6907d0ba5bf0df4adadd20e7 | |
| parent | 6ea31c56a54ef79b46b56ad35a308db474d600d3 [diff] | |
| parent | cf6c31fc5c3de225348742c95cc6185fca20a2f2 [diff] |
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