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
..
boards	ATMEL: fix nand ecc support	2012-03-15 23:26:32 +08:00
boot	avr32: remove .note.gnu.build-id section when making vmlinux.bin	2008-12-17 11:44:10 +01:00
configs	rtc: fix build warnings in defconfigs	2011-06-15 20:04:02 -07:00
include/asm	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
kernel	sched/rt: Use schedule_preempt_disabled()	2012-03-01 10:28:03 +01:00
lib	asm-generic: rename generic little-endian bitops functions	2011-03-23 19:46:11 -07:00
mach-at32ap	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
mm	avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:30:59 -04:00
oprofile	Disintegrate asm/system.h for AVR32	2012-03-28 18:30:01 +01:00
Kconfig	avr32: select generic atomic64_t support	2012-02-03 16:16:40 -08:00
Kconfig.debug	[AVR32] Include instrumentation menu	2008-01-25 08:31:40 +01:00
Makefile	kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line	2010-08-03 14:09:45 +02:00