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
..
am35x.c	Here we have a big rework done by Heikki Krogerus (thanks) which	2012-03-01 08:45:33 -08:00
blackfin.c	Here we have a big rework done by Heikki Krogerus (thanks) which	2012-03-01 08:45:33 -08:00
blackfin.h	usb: musb: drop a gigantic amount of ifdeferry	2011-07-01 14:31:10 -07:00
cppi_dma.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
cppi_dma.h
da8xx.c	Here we have a big rework done by Heikki Krogerus (thanks) which	2012-03-01 08:45:33 -08:00
davinci.c	Here we have a big rework done by Heikki Krogerus (thanks) which	2012-03-01 08:45:33 -08:00
davinci.h
Kconfig	usb: musb: cleanup kconfig	2011-12-20 14:01:38 +02:00
Makefile	usb: musb: use a Kconfig choice to pick the right DMA method	2011-12-12 11:51:41 +02:00
musb_core.c	usb: core: hcd: make hcd->irq unsigned	2012-03-01 09:31:22 -08:00
musb_core.h	usb: otg: Rename otg_transceiver to usb_phy	2012-02-13 13:34:36 +02:00
musb_debug.h	usb: musb: remove extern qualifier from musb_debug.h header	2011-12-21 13:21:02 +02:00
musb_debugfs.c	usb: musb: debugfs: fix error check	2012-02-01 11:02:46 +02:00
musb_dma.h
musb_gadget.c	usb: core: hcd: make hcd->irq unsigned	2012-03-01 09:31:22 -08:00
musb_gadget.h
musb_gadget_ep0.c	usb: musb: headers cleanup	2011-12-12 11:51:52 +02:00
musb_host.c	usb: musb: fix reset issue with full speed device	2011-12-14 09:32:51 +02:00
musb_host.h	usb: musb: drop a gigantic amount of ifdeferry	2011-07-01 14:31:10 -07:00
musb_io.h	usb: musb: fix a build error on mips	2012-02-03 09:29:13 +02:00
musb_regs.h	usb: musb: tusb6010: fix compilation	2011-08-12 11:52:50 +03:00
musb_virthub.c	usb: musb: Start using struct usb_otg	2012-02-13 13:52:54 +02:00
musbhsdma.c	USB: irq: Remove IRQF_DISABLED	2011-09-18 01:39:36 -07:00
musbhsdma.h
omap2430.c	Here we have a big rework done by Heikki Krogerus (thanks) which	2012-03-01 08:45:33 -08:00
omap2430.h
tusb6010.c	Here we have a big rework done by Heikki Krogerus (thanks) which	2012-03-01 08:45:33 -08:00
tusb6010.h
tusb6010_omap.c	usb: musb: tusb6010: fix compilation	2011-08-12 11:52:50 +03:00
ux500.c	Here we have a big rework done by Heikki Krogerus (thanks) which	2012-03-01 08:45:33 -08:00
ux500_dma.c	dmaengine/dma_slave: introduce inline wrappers	2012-03-21 19:20:22 +05:30