Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Dec 2019 20:20:42 +0000 (12:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Dec 2019 20:20:42 +0000 (12:20 -0800)
commit25cfb0c7de3f14e283a43dcd6de903657f9f98c7
tree9096a7106f99882c1bbdd07d5edca27c5260bf96
parentb08baef02b26cf7c2123e4a24a2fa1fb7a593ffb
parent3ad3cbe305b5a23d829d3723b60be59c36713992
Merge branch 'for-next' of git://git./linux/kernel/git/gerg/m68knommu

Pull m68knommu update from Greg Ungerer:
 "Only a single change, to enable coldfire preemption entry code for all
  preemption types"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k/coldfire: Use CONFIG_PREEMPTION