Merge tag 'm68k-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert...

Pull m68k updates from Geert Uytterhoeven:

 - Add support for QEMU virt-ctrl, and use it for system reset
   and power off on the virt platform

 - defconfig updates

 - Miscellaneous fixes and improvements

* tag 'm68k-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: virt: Switch to qemu-virt-ctrl driver
  power: reset: Add QEMU virt-ctrl driver
  m68k: defconfig: Update defconfigs for v7.0-rc1
  m68k: emu: Replace unbounded sprintf() in nfhd_init_one()
  m68k: uapi: Add ucontext.h
  m68k: defconfig: hp300: Enable monochrome and 16-color linux logos
  m68k: q40: Remove commented out code

diff --cc MAINTAINERS
Simple merge

diff --cc arch/m68k/configs/amiga_defconfig
Simple merge

diff --cc arch/m68k/configs/apollo_defconfig
Simple merge

diff --cc arch/m68k/configs/atari_defconfig
Simple merge

diff --cc arch/m68k/configs/hp300_defconfig
Simple merge

diff --cc arch/m68k/configs/mac_defconfig
Simple merge

diff --cc arch/m68k/configs/multi_defconfig
Simple merge

diff --cc arch/m68k/configs/q40_defconfig
Simple merge