From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Jun 2018 07:30:01 +0000 (+0900)
Subject: Merge tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v4.18-rc2~30
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6d90eb7ba341b3eb035121eff0b69d370cbc251e;p=uclinux-h8%2Flinux.git

Merge tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping rename from Christoph Hellwig:
 "Move all the dma-mapping code to kernel/dma and lose their dma-*
  prefixes"

* tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: move all DMA mapping code to kernel/dma
  dma-mapping: use obj-y instead of lib-y for generic dma ops
---

6d90eb7ba341b3eb035121eff0b69d370cbc251e