| commit | 5b523ff281b9f97ec75d526e2750381c6e8c9326 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 13 08:58:32 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 13 08:58:32 2016 -0700 |
| tree | d473bf600d0cb70d7dfd0295533850506ddab0f4 | |
| parent | e012766258ad7a90a3474ac24905b7df336e698f [diff] | |
| parent | 2763ee644809820fb1b741f1e7dd779038092324 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu Pull m68knommu/coldfire fix from Greg Ungerer: "Only a single change that removes a local arch specific gpio bus sysfs device that now clashes with the generic gpio bus sysfs device interface" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k/gpio: remove arch specific sysfs bus device