From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Sep 2019 20:34:28 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v5.4-rc1~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16da0961d3d5521f6541a422c5485ea4ddfe860b;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu fix from Greg Ungerer:
 "Only a single change, fix up header include in ColdFire specific GPIO
  handling code"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: coldfire: Include the GPIO driver header
---

16da0961d3d5521f6541a422c5485ea4ddfe860b