Merge tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Sep 2017 15:51:03 +0000 (05:51 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Sep 2017 15:51:03 +0000 (05:51 -1000)
Pull dma mapping fix from Christoph Hellwig:
 "A fix for a fix that went in this merge window from Arnd"

* tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping:
  dma-coherent: fix rmem_dma_device_init regression


Trivial merge