m68k/defconfig: Update defconfigs for v4.2-rc1

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

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/bvme6000_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/mvme147_defconfig
Simple merge

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

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

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

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