Merge tag 'dmaengine-fix-4.7-rc4' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Jun 2016 16:52:20 +0000 (06:52 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Jun 2016 16:52:20 +0000 (06:52 -1000)
commit9af1f5d8f20f97884da55817ab80a6fcd170f296
treebad9c34daa7c4e864e47b1a103b2442995279954
parent049a40c0a2d4b458583161ec1b9ce109408cb1aa
parent5156463588c3999b630d9ffc6061a54962f3c2d9
Merge tag 'dmaengine-fix-4.7-rc4' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine fixes from Vinod Koul:
 "Some fixes has piled up, so time to send them upstream.

  These fixes include:
   - at_xdmac fixes for residue and other stuff
   - update MAINTAINERS for dma dt bindings
   - mv_xor fix for incorrect offset"

* tag 'dmaengine-fix-4.7-rc4' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: mv_xor: Fix incorrect offset in dma_map_page()
  dmaengine: at_xdmac: double FIFO flush needed to compute residue
  dmaengine: at_xdmac: fix residue corruption
  dmaengine: at_xdmac: align descriptors on 64 bits
  MAINTAINERS: Add file patterns for dma device tree bindings
MAINTAINERS