Linus Torvalds a6dc77254b Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm ... Pull ARM DMA engine updates from Russell King: "This looks scary at first glance, but what it is is: - a rework of the sa11x0 DMA engine driver merged during the previous cycle, to extract a common set of helper functions for DMA engine implementations. - conversion of amba-pl08x.c to use these helper functions. - addition of OMAP DMA engine driver (using these helper functions), and conversion of some of the OMAP DMA users to use DMA engine. Nothing in the helper functions is ARM specific, so I hope that other implementations can consolidate some of their code by making use of these helpers. This has been sitting in linux-next most of the merge cycle, and has been tested by several OMAP folk. I've tested it on sa11x0 platforms, and given it my best shot on my broken platforms which have the amba-pl08x controller. The last point is the addition to feature-removal-schedule.txt, which will have a merge conflict. Between myself and TI, we're planning to remove the old TI DMA implementation next year." Fix up trivial add/add conflicts in Documentation/feature-removal-schedule.txt and drivers/dma/{Kconfig,Makefile} * 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm: (53 commits) ARM: 7481/1: OMAP2+: omap2plus_defconfig: enable OMAP DMA engine ARM: 7464/1: mmc: omap_hsmmc: ensure probe returns error if DMA channel request fails Add feature removal of old OMAP private DMA implementation mtd: omap2: remove private DMA API implementation mtd: omap2: add DMA engine support spi: omap2-mcspi: remove private DMA API implementation spi: omap2-mcspi: add DMA engine support ARM: omap: remove mmc platform data dma_mask and initialization mmc: omap: remove private DMA API implementation mmc: omap: add DMA engine support mmc: omap_hsmmc: remove private DMA API implementation mmc: omap_hsmmc: add DMA engine support dmaengine: omap: add support for cyclic DMA dmaengine: omap: add support for setting fi dmaengine: omap: add support for returning residue in tx_state method dmaengine: add OMAP DMA engine driver dmaengine: sa11x0-dma: add cyclic DMA support dmaengine: sa11x0-dma: fix DMA residue support dmaengine: PL08x: ensure all descriptors are freed when channel is released dmaengine: PL08x: get rid of write only pool_ctr and free_txd locking ...		2012-08-01 16:41:07 -07:00
..
chips	mtd: cfi_cmdset_0002: Slight cleanup of fixup messages	2012-05-13 23:34:36 -05:00
devices	- More robust parsing especially of xattr data in JFFS2	2012-06-01 16:55:42 -07:00
lpddr	mtd: lpddr: replace open-coded ARRAY_SIZE with macro	2012-05-13 22:47:31 -05:00
maps	- More robust parsing especially of xattr data in JFFS2	2012-06-01 16:55:42 -07:00
nand	Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm	2012-08-01 16:41:07 -07:00
onenand	mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN	2012-05-13 23:14:23 -05:00
tests
ubi	UBI: harmonize the update of ubi->beb_rsvd_pebs	2012-07-18 14:30:34 +03:00
afs.c
ar7part.c
bcm63xxpart.c	mtd: bcm63xxpart: handle Broadcom partition order	2012-05-13 22:55:03 -05:00
cmdlinepart.c	mtd: cmdlinepart: fix commentary	2012-05-13 23:03:36 -05:00
ftl.c
inftlcore.c
inftlmount.c
Kconfig	mtd: of_parts: fix breakage in Kconfig	2012-06-01 20:06:59 +01:00
Makefile
mtd_blkdevs.c
mtdblock_ro.c
mtdblock.c
mtdchar.c	mtd: fix oops in dataflash driver	2012-05-07 20:29:50 +01:00
mtdconcat.c
mtdcore.c	mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN	2012-05-13 23:14:23 -05:00
mtdcore.h
mtdoops.c	kmsg - kmsg_dump() use iterator to receive log buffer content	2012-06-15 14:53:59 -07:00
mtdpart.c	mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN	2012-05-13 23:14:23 -05:00
mtdsuper.c	VFS: Pass mount flags to sget()	2012-07-14 16:38:34 +04:00
mtdswap.c
nftlcore.c
nftlmount.c
ofpart.c
redboot.c
rfd_ftl.c
sm_ftl.c
sm_ftl.h
ssfdc.c