git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e012766 2763ee6)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2016 15:58:32 +0000 (08:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2016 15:58:32 +0000 (08:58 -0700)
commit5b523ff281b9f97ec75d526e2750381c6e8c9326
treed473bf600d0cb70d7dfd0295533850506ddab0f4tree
parente012766258ad7a90a3474ac24905b7df336e698fcommit | diff
parent2763ee644809820fb1b741f1e7dd779038092324commit | diff
Merge branch 'for-linus' of git://git./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
Unnamed repository; edit this file 'description' to name the repository.