From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 May 2017 17:10:52 +0000 (-0700)
Subject: Merge tag 'm68k-for-v4.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.12-rc1~138
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ceb198bb007b84ead867e87a71ffe715c4412b15;p=karo-tx-linux.git

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
---

ceb198bb007b84ead867e87a71ffe715c4412b15