git.ipfire.org Git - people/ms/linux.git/commit

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

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

author	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 13 Nov 2017 20:10:24 +0000 (12:10 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 13 Nov 2017 20:10:24 +0000 (12:10 -0800)
commit	9e09d05cfe7df9efa7bbca7d679af534a616026e
tree	ae9501674896ae1bc19a78ad4c97fbfc666e4bcb	tree \| snapshot
parent	d60a540ac5f2fbab3e6fe592717b445bd7343a91	commit \| diff
parent	5e387199c17c4d2fb8b72ada82fbf81f4ba6f317	commit \| diff

arch/m68k/include/asm/mac_iop.h	diff1 \|	diff2 \|	blob \| history
arch/m68k/mac/baboon.c	diff1 \|	diff2 \|	blob \| history
arch/m68k/mac/oss.c	diff1 \|	diff2 \|	blob \| history
arch/m68k/mac/via.c	diff1 \|	diff2 \|	blob \| history
drivers/macintosh/adb-iop.c	diff1 \|	diff2 \|	blob \| history
drivers/nubus/nubus.c	diff1 \|	diff2 \|	blob \| history