From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Apr 2016 15:58:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: android-x86-7.1-r1~1700
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5b523ff281b9f97ec75d526e2750381c6e8c9326;p=android-x86%2Fkernel.git

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
---

5b523ff281b9f97ec75d526e2750381c6e8c9326