From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Apr 2018 16:15:46 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v4.19~1254
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2025fef0ca0c8c7fa730a3e0399243721a4925f1;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'for-next' of git://git./linux/kernel/git/gerg/m68knommu

Pull m68knommu update from Greg Ungerer:
 "Only a single fix to set the DMA masks in the ColdFire FEC platform
  data structure.

  This stops the warning from dma-mapping.h at boot time"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: set dma and coherent masks for platform FEC ethernets
---

2025fef0ca0c8c7fa730a3e0399243721a4925f1