Merge 'm68knommu' from https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git (for-next)

Merged-SHA: c94727deb10720a8d42947fc6cb64373dab80472

 arch/m68k/Kconfig.machine           |  8 ++++----
 arch/m68k/coldfire/amcore.c         |  4 ++--
 arch/m68k/coldfire/stmark2.c        |  4 ++--
 arch/m68k/configs/stmark2_defconfig | 33 ++++++++++++++++++++-------------
 4 files changed, 28 insertions(+), 21 deletions(-)