| commit | ba3b7d827e96e90e3df82695c96b3f9a666c0d82 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Apr 14 10:54:40 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Apr 14 10:54:40 2013 -0700 |
| tree | c491c4152ec5dcc80cf557a7562116a787024911 | |
| parent | 4f9a197c223cc019801be948e444d05904391109 [diff] | |
| parent | b2dfaa8d33cee9dd4ed78979f5d70063df546101 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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