Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jan 2013 18:17:49 +0000 (10:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jan 2013 18:17:49 +0000 (10:17 -0800)
commit3f58e0945eb064777f7b77e65ae44cb4f1efc92e
tree46b49ddc57887a52ba7c0d820e06d7313a7ce64b
parentacc5da0f9d89299b4115cf9cb995c0157cd6bf12
parentb9bb37f5486ba05d2b557dbf1aeb754fef618985
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes from Vinod Koul:
 "A few fixes on slave dmanengine.  There are trivial fixes in imx-dma,
  tegra-dma & ioat driver"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dma: tegra: implement flags parameters for cyclic transfer
  dmaengine: imx-dma: Disable use of hw_chain to fix sg_dma transfers.
  ioat: Fix DMA memory sync direction correct flag
drivers/dma/ioat/dma_v3.c
drivers/dma/tegra20-apb-dma.c