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
..
acpi	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
asm-generic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2012-03-29 14:49:45 -07:00
crypto	crypto: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:16 +08:00
drm	The following text was taken from the original review request:	2012-03-24 10:08:39 -07:00
keys
linux	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
math-emu
media	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
misc
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-03-27 16:52:32 -07:00
pcmcia
rdma	Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next	2012-03-19 09:50:33 -07:00
rxrpc
scsi	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
sound	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
target
trace	Ext4 commits for 3.3 merge window; mostly cleanups and bug fixes	2012-03-28 10:02:55 -07:00
video	Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm	2012-03-27 18:17:02 -07:00
xen	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
Kbuild