From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Dec 2017 02:16:20 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v6.6-pxa1908~15214
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=10f837e52b57bd69b811aeeb8fb1a095e26f6575;p=linux.git

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

Pull m68knommu fixes from Greg Ungerer:
 "There are two fixes here. One to add a missing linker section to the
  m68k architecture linker scripts, the other to fix a defconfig build
  problem"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k/defconfig: fix stmark2 broken local compilation
  m68k: add missing SOFTIRQENTRY_TEXT linker section
---

10f837e52b57bd69b811aeeb8fb1a095e26f6575