From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Jun 2016 16:52:20 +0000 (-1000)
Subject: Merge tag 'dmaengine-fix-4.7-rc4' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v4.14-rc1~3005
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9af1f5d8f20f97884da55817ab80a6fcd170f296;p=platform%2Fkernel%2Flinux-rpi.git

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
---

9af1f5d8f20f97884da55817ab80a6fcd170f296