Linus Torvalds ef08e78268 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine update from Vinod Koul: "This includes the cookie cleanup by Russell, the addition of context parameter for dmaengine APIs, more arm dmaengine driver cleanup by moving code to dmaengine, this time for imx by Javier and pl330 by Boojin along with the usual driver fixes." Fix up some fairly trivial conflicts with various other cleanups. * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits) dmaengine: imx: fix the build failure on x86_64 dmaengine: i.MX: Fix merge of cookie branch. dmaengine: i.MX: Add support for interleaved transfers. dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages. dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'. dmaengine: imx-dma: remove unused arg of imxdma_sg_next. dmaengine: imx-dma: remove internal structure. dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure. dmaengine: imx-dma: remove 'in_use' field of 'internal' structure. dmaengine: imx-dma: remove sg member from internal structure. dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function. dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function. dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function. dmaengine: imx-dma: remove dma_mode member of internal structure. dmaengine: imx-dma: remove data member from internal structure. dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c dmaengine: at_hdmac: add slave config operation dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic dmaengine/dma_slave: introduce inline wrappers dma: imx-sdma: Treat firmware messages as warnings instead of erros ...		2012-03-29 15:34:57 -07:00
..
bus.h	ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver	2012-03-16 23:32:35 +00:00
clcd.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
kmi.h	[ARM] Move AMBA include files to include/linux/amba/	2006-01-07 13:52:45 +00:00
mmci.h	ARM: 7219/1: mmc: mmci: Change vdd_handler to a generic ios_handler	2012-01-20 00:00:56 +00:00
pl08x.h	dmaengine: move last completed cookie into generic dma_chan structure	2012-03-13 11:36:06 +05:30
pl022.h	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
pl061.h	gpio: pl061: convert to use 0 for no irq	2012-01-04 10:10:19 -06:00
pl093.h	ARM: PL093: Header file for PL093 SSMC PrimeCell	2009-07-30 23:22:54 +01:00
pl330.h	DMA: PL330: Merge PL330 driver into drivers/dma/	2012-03-08 17:59:28 +05:30
serial.h	ARM: 7339/1: amba/serial.h: Include types.h for resolving dependency of type bool	2012-02-23 22:07:55 +00:00