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
..
chips	mtd: use for_each_clear_bit()	2012-03-23 16:58:34 -07:00
devices	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
lpddr	mtd: lpddr: drop unnecessary zeroing	2012-01-09 18:24:48 +00:00
maps	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
nand	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
onenand	MTD: Relax dependencies	2012-03-25 00:29:56 +01:00
tests	mtd: introduce mtd_can_have_bb helper	2012-01-09 18:26:24 +00:00
ubi	UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TARGET_BITFLIPS	2012-03-09 10:31:18 +02:00
afs.c	mtd: introduce mtd_read interface	2012-01-09 18:25:19 +00:00
ar7part.c	mtd: introduce mtd_read interface	2012-01-09 18:25:19 +00:00
bcm63xxpart.c	mtd: introduce mtd_read interface	2012-01-09 18:25:19 +00:00
cmdlinepart.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
ftl.c	mtd: do not use mtd->sync directly	2012-01-09 18:26:21 +00:00
inftlcore.c	mtd: introduce mtd_write_oob interface	2012-01-09 18:25:24 +00:00
inftlmount.c	mtd: introduce mtd_block_markbad interface	2012-01-09 18:25:48 +00:00
Kconfig	MTD: Relax dependencies	2012-03-25 00:29:56 +01:00
Makefile	mtd: maps: bcm963xx-flash: make CFE partition parsing an mtd parser	2012-01-09 18:15:31 +00:00
mtd_blkdevs.c	mtd: mtd_blkdevs: don't increase 'open' count on error path	2012-01-09 18:04:01 +00:00
mtdblock.c	mtd: do not use mtd->sync directly	2012-01-09 18:26:21 +00:00
mtdblock_ro.c	mtd: introduce mtd_write interface	2012-01-09 18:25:20 +00:00
mtdchar.c	magic.h: move some FS magic numbers into magic.h	2012-03-23 16:58:31 -07:00
mtdconcat.c	mtd: do not use mtd->block_markbad directly	2012-01-09 18:26:26 +00:00
mtdcore.c	mtd: fix MTD suspend	2012-01-30 14:23:07 +00:00
mtdcore.h	mtd: hide parse_mtd_partitions	2011-09-11 15:02:13 +03:00
mtdoops.c	kexec: remove KMSG_DUMP_KEXEC	2012-01-12 20:13:11 -08:00
mtdpart.c	mtd: introduce mtd_block_markbad interface	2012-01-09 18:25:48 +00:00
mtdsuper.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
mtdswap.c	mtd: do not use mtd->block_markbad directly	2012-01-09 18:26:26 +00:00
nftlcore.c	mtd: introduce mtd_can_have_bb helper	2012-01-09 18:26:24 +00:00
nftlmount.c	mtd: introduce mtd_block_markbad interface	2012-01-09 18:25:48 +00:00
ofpart.c	mtd: ofpart: add ofoldpart alias	2011-09-11 15:02:14 +03:00
redboot.c	mtd: introduce mtd_can_have_bb helper	2012-01-09 18:26:24 +00:00
rfd_ftl.c	mtd: do not use mtd->sync directly	2012-01-09 18:26:21 +00:00
sm_ftl.c	mtd: introduce mtd_has_oob helper	2012-01-09 18:26:08 +00:00
sm_ftl.h	mtd: sm_ftl: cosmetic, use bool when possible	2010-10-25 01:33:08 +01:00
ssfdc.c	mtd: introduce mtd_block_isbad interface	2012-01-09 18:25:47 +00:00