From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Sep 2019 22:28:12 +0000 (-0700)
Subject: Merge tag 'm68k-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert... 
X-Git-Tag: v5.4-rc1~191
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbcda58ad98936079c48728c12c27a2f333fb484;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'm68k-for-v5.4-tag1' of git://git./linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

 - ioremap() cleanups

 - defconfig updates

 - small fixes and cleanups

* tag 'm68k-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Remove ioremap_fullcache()
  m68k: Simplify ioremap_nocache()
  m68k: defconfig: Update defconfigs for v5.3-rc2
  m68k: atari: Rename shifter to shifter_st to avoid conflict
  m68k: Prevent some compiler warnings in Coldfire builds
  m68k: mac: Revisit floppy disc controller base addresses
---

dbcda58ad98936079c48728c12c27a2f333fb484