Merge tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull m68k updates from Geert Uytterhoeven:

  - more printk modernization

  - various cleanups and fixes (incl. a race condition) for Mac

  - defconfig updates

* tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/defconfig: Update defconfigs for v4.14-rc7
  m68k/mac: Add mutual exclusion for IOP interrupt polling
  m68k/mac: Disentangle VIA/RBV and NuBus initialization
  m68k/mac: Disentangle VIA and OSS initialization
  m68k/mac: More printk modernization

diff --cc arch/m68k/include/asm/mac_iop.h
Simple merge

diff --cc arch/m68k/mac/baboon.c
Simple merge

diff --cc arch/m68k/mac/oss.c
Simple merge

diff --cc arch/m68k/mac/via.c
Simple merge

diff --cc drivers/macintosh/adb-iop.c
Simple merge

diff --cc drivers/nubus/nubus.c
Simple merge