Merge tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jun 2018 07:30:01 +0000 (16:30 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jun 2018 07:30:01 +0000 (16:30 +0900)
commit6d90eb7ba341b3eb035121eff0b69d370cbc251e
tree332809825f5aab97e839ab4534e5b81fb28e0c84
parentf5b65348fd77839b50e79bc0a5e536832ea52d8d
parentcf65a0f6f6ff7631ba0ac0513a14ca5b65320d80
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
MAINTAINERS
lib/Kconfig