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
..
common.c	usb: renesas_usbhs: add IRQ resource decoding for IRQF_SHARED	2012-01-24 11:32:56 +02:00
common.h	usb: renesas_usbhs: add IRQ resource decoding for IRQF_SHARED	2012-01-24 11:32:56 +02:00
fifo.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
fifo.h	usb: renesas: fix scheduling in atomic context bug	2012-02-14 13:44:53 +02:00
Kconfig	usb: gadget: renesas_usbhs: drop dependency	2011-10-13 20:41:54 +03:00
Makefile	usb: gadget: renesas_usbhs: fixup driver compile style	2011-10-13 20:41:54 +03:00
mod_gadget.c	This merge is rather big. Here's what it contains:	2012-03-01 09:20:28 -08:00
mod_host.c	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb	2012-01-09 12:09:47 -08:00
mod.c	usb: renesas_usbhs: add IRQ resource decoding for IRQF_SHARED	2012-01-24 11:32:56 +02:00
mod.h	usb: gadget: renesas_usbhs: fixup section mismatch warning	2011-11-14 11:51:23 -08:00
pipe.c	usb: renesas: pipe: convert a long if into a XOR operation	2011-12-21 13:24:43 +02:00
pipe.h	usb: renesas_usbhs: add usbhs_pipe_is_stall()	2011-12-12 11:45:15 +02:00