From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Jul 2018 16:45:25 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v5.15~8488
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=760885f282b1531f89c4ed8aa198ae0ca1acc172;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus' of git://git./linux/kernel/git/gerg/m68knommu

Pull m68knommu fix from Greg Ungerer:
 "A single fix for breakage introduced in this merge window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: fix "bad page state" oops on ColdFire boot
---

760885f282b1531f89c4ed8aa198ae0ca1acc172