From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Nov 2014 00:24:27 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.18-rc6~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ec69c7ebc2cb8df1f33b26f4492481c452fef66;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine fixes from Vinod Koul:
 "We have couple of fixes for dmaengine queued up:
   - dma mempcy fix for dma configuration of sun6i by Maxime
   - pl330 fixes: First the fixing allocation for data buffers by Liviu
     and then Jon's fixe for fifo width and usage"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: Fix allocation size for PL330 data buffer depth.
  dmaengine: pl330: Limit MFIFO usage for memcpy to avoid exhausting entries
  dmaengine: pl330: Align DMA memcpy operations to MFIFO width
  dmaengine: sun6i: Fix memcpy operation
---

4ec69c7ebc2cb8df1f33b26f4492481c452fef66