commit ceb198bb007b84ead867e87a71ffe715c4412b15
author Linus Torvalds <torvalds@linux-foundation.org> Tue May 02 10:10:52 2017 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue May 02 10:10:52 2017 -0700
tree 2d933558cdef1f0e8e7f8efed8b1444a5558fa04
parent b68e7e952f24527de62f4768b1cead91f92f5f6e
parent f6ab4d59a5fe205f12287e515a43fc5e6de779b1

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

Pull m68k updates from Geert Uytterhoeven:

  - more kernel message modernizations and cleanups

  - Mac and Nubus improvements and cleanups.

* tag 'm68k-for-v4.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  nubus: Add MVC and VSC video card definitions
  nubus: Clean up whitespace
  nubus: Clean up printk calls
  nubus: Fix nubus_rewinddir
  m68k/mac: Clarify IOP message alloc/free confusion
  m68k/mac: Adopt platform_device_register_simple()
  m68k/mac: Modernize printing of kernel messages
  m68k/mac: IOP - Modernize printing of kernel messages