Merge tag 'dma-mapping-4.18-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Jul 2018 17:45:13 +0000 (10:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Jul 2018 17:45:13 +0000 (10:45 -0700)
commitc350d6d1d78789d73e8bf2047ab6564a4af4a02b
tree317b5d11ed6684360cd28c1ab177d93954fe6bfb
parent883c9ab9eb595f8542d01e55d29a346c8d96862e
parent210d0797c97d0e8f3b1a932a0dc143f4c57008a3
Merge tag 'dma-mapping-4.18-2' of git://git.infradead.org/users/hch/dma-mapping

Pull dma mapping fixlet from Christoph Hellwig:
 "Add a missing export required by riscv and unicore"

* tag 'dma-mapping-4.18-2' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: export swiotlb_dma_ops