From: Linus Torvalds 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: v4.18-rc4~26 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=760885f282b1531f89c4ed8aa198ae0ca1acc172;p=users%2Fhch%2Fdma-mapping.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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