Linus Torvalds 52d589a01d Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine updates from Vinod Koul: "For dmaengine contributions we have: - designware cleanup by Andy - my series moving device_control users to dmanegine_xxx APIs for later removal of device_control API - minor fixes spread over drivers mainly mv_xor, pl330, mmp, imx-sdma etc" * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (60 commits) serial: atmel: add missing dmaengine header dmaengine: remove FSLDMA_EXTERNAL_START dmaengine: freescale: remove FSLDMA_EXTERNAL_START control method carma-fpga: move to fsl_dma_external_start() carma-fpga: use dmaengine_xxx() API dmaengine: freescale: add and export fsl_dma_external_start() dmaengine: add dmaengine_prep_dma_sg() helper video: mx3fb: use dmaengine_terminate_all() API serial: sh-sci: use dmaengine_terminate_all() API net: ks8842: use dmaengine_terminate_all() API mtd: sh_flctl: use dmaengine_terminate_all() API mtd: fsmc_nand: use dmaengine_terminate_all() API V4L2: mx3_camer: use dmaengine_pause() API dmaengine: coh901318: use dmaengine_terminate_all() API pata_arasan_cf: use dmaengine_terminate_all() API dmaengine: edma: check for echan->edesc => NULL in edma_dma_pause() dmaengine: dw: export probe()/remove() and Co to users dmaengine: dw: enable and disable controller when needed dmaengine: dw: always export dw_dma_{en,dis}able dmaengine: dw: introduce dw_dma_on() helper ...		2014-10-18 18:11:04 -07:00
..
chips	Merge l2-mtd/next into l2-mtd/master	2014-08-19 11:57:23 -07:00
devices	mtd: move support for struct flash_platform_data into m25p80	2014-09-28 15:27:03 -07:00
lpddr	mtd: lpddr: fix Kconfig dependency, for I/O accessors	2014-05-26 10:38:25 -07:00
maps	mtd: physmap_of: Add non-obsolete map_rom probe	2014-09-22 10:13:13 -07:00
nand	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-10-18 18:11:04 -07:00
onenand	mtd: onenand: remove s5pc100 related onenand codes	2014-07-13 07:35:14 +09:00
spi-nor	mtd: move support for struct flash_platform_data into m25p80	2014-09-28 15:27:03 -07:00
tests	mtd: tests: fix integer overflow issues	2014-08-19 11:53:08 -07:00
ubi	UBI: Fastmap: Calc fastmap size correctly	2014-10-03 17:33:28 +03:00
afs.c	mtd: make register_mtd_parser return void	2014-01-03 11:22:22 -08:00
ar7part.c	mtd: make register_mtd_parser return void	2014-01-03 11:22:22 -08:00
bcm47xxpart.c	mtd: bcm47xxpart: find NVRAM partitions in middle blocks	2014-09-17 23:15:38 -07:00
bcm63xxpart.c	mtd: make register_mtd_parser return void	2014-01-03 11:22:22 -08:00
cmdlinepart.c	mtd: cmdlinepart: Spelling s/trucate/truncate/	2014-07-02 15:17:15 -07:00
ftl.c	mtd/ftl: fix the double free of the buffers allocated in build_maps()	2014-07-14 18:41:20 -07:00
inftlcore.c
inftlmount.c	mtd: delete non-required instances of include <linux/init.h>	2014-03-10 22:42:22 -07:00
Kconfig	mtd: spi-nor: add the framework for SPI NOR	2014-04-14 11:22:58 -07:00
Makefile	mtd: spi-nor: shorten Kconfig naming	2014-04-14 11:23:01 -07:00
mtd_blkdevs.c	block: disable entropy contributions for nonrot devices	2014-10-04 10:55:32 -06:00
mtdblock_ro.c
mtdblock.c
mtdchar.c	mtd: terminate user-provided string	2014-08-19 11:53:09 -07:00
mtdconcat.c
mtdcore.c	mtd: remove dead non-char logic	2014-08-19 11:53:08 -07:00
mtdcore.h
mtdoops.c
mtdpart.c	mtd: Account for BBT blocks when a partition is being allocated	2014-07-08 18:38:29 -07:00
mtdsuper.c
mtdswap.c	mtd: use __packed shorthand	2014-08-19 11:53:08 -07:00
nftlcore.c
nftlmount.c
ofpart.c	mtd: make register_mtd_parser return void	2014-01-03 11:22:22 -08:00
redboot.c	mtd: make register_mtd_parser return void	2014-01-03 11:22:22 -08:00
rfd_ftl.c	mtd: remove some duplicative checks	2014-03-10 22:42:25 -07:00
sm_ftl.c	mtd: sm_ftl: initialize error code	2014-08-19 11:53:07 -07:00
sm_ftl.h
ssfdc.c