]> git.baikalelectronics.ru Git - 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>
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)
commite757cae4562ea2b55139e8c656ecf22cd39da6e9
treed473bf600d0cb70d7dfd0295533850506ddab0f4
parent3483361c7f8e9f35ac9cd946006e8ae7fc87decc
parent151b1cb2531f05a93a734cc581ccf2065baae2ae
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