From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Jan 2016 18:33:51 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~10986
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8;p=mirror_ubuntu-focal-kernel.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Provide __phys_to_pfn() and __pfn_to_phys()
  m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular
  m68k/defconfig: Update defconfigs for v4.4-rc1
  m68k/mac: Kill psc_present
---

2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8