Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jan 2016 18:33:51 +0000 (10:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jan 2016 18:33:51 +0000 (10:33 -0800)
commit2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8
tree97383c07c5ba1bf78ad50be4574e7f2fb26f9c15
parentc5c80bd923d34f7dc70e7b23eb427cd284989a1b
parenteb37bc3f85b69f529d2ad06c41fad8dedd654c76
Merge branch 'for-linus' of git://git./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
arch/m68k/sun3/config.c