From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Aug 2018 23:23:03 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: Ubuntu-5.10.0-12.13~7186
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8fdd36d44205cd6bccca26246ae84d7515d10015;p=mirror_ubuntu-hirsute-kernel.git

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

Pull m68knommu updates from Greg Ungerer:
 "Only two changes.

  One cleans up warnings in the ColdFire DMA code, the other stubs out
  (with warnings) ColdFire clock api functions not normally used"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: Fix typos in Coldfire 5272 DMA debug code
  m68k: coldfire: Normalize clk API
---

8fdd36d44205cd6bccca26246ae84d7515d10015