From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 May 2012 16:31:59 +0000 (-0700)
Subject: Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: Ubuntu-5.0.0-8.9~15984
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d5adf235adc8d8d67c10afd43922c92753f6be3c;p=mirror_ubuntu-disco-kernel.git

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

Pull slave-dmaengine updates from Vinod Koul:
 "Nothing exciting this time, odd fixes in a bunch of drivers"

* 'next' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: at_hdmac: take maxburst from slave configuration
  dmaengine: at_hdmac: remove ATC_DEFAULT_CTRLA constant
  dmaengine: at_hdmac: remove some at_dma_slave comments
  dma: imx-sdma: make channel0 operations atomic
  dmaengine: Fixup dmaengine_prep_slave_single() to be actually useful
  dmaengine: Use dma_sg_len(sg) instead of sg->length
  dmaengine: Use sg_dma_address instead of sg_phys
  DMA: PL330: Remove duplicate header file inclusion
  dma: imx-sdma: keep the callbacks invoked in the tasklet
  dmaengine: dw_dma: add Device Tree probing capability
  dmaengine: dw_dmac: Add clk_{un}prepare() support
  dma/amba-pl08x: add support for the Nomadik variant
  dma/amba-pl08x: check for terminal count status only
---

d5adf235adc8d8d67c10afd43922c92753f6be3c