Linus Torvalds b7e97d2211 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine updates from Vinod Koul: "This time we have Andy updates on dw_dmac which is attempting to make this IP block available as PCI and platform device though not fully complete this time. We also have TI EDMA moving the dma driver to use dmaengine APIs, also have a new driver for mmp-tdma, along with bunch of small updates. Now for your excitement the merge is little unusual here, while merging the auto merge on linux-next picks wrong choice for pl330 (drivers/dma/pl330.c) and this causes build failure. The correct resolution is in linux-next. (DMA: PL330: Fix build error) I didn't back merge your tree this time as you are better than me so no point in doing that for me :)" Fixed the pl330 conflict as in linux-next, along with trivial header file conflicts due to changed includes. * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits) dma: tegra: fix interrupt name issue with apb dma. dw_dmac: fix a regression in dwc_prep_dma_memcpy dw_dmac: introduce software emulation of LLP transfers dw_dmac: autoconfigure data_width or get it via platform data dw_dmac: autoconfigure block_size or use platform data dw_dmac: get number of channels from hardware if possible dw_dmac: fill optional encoded parameters in register structure dw_dmac: mark dwc_dump_chan_regs as inline DMA: PL330: return ENOMEM instead of 0 from pl330_alloc_chan_resources DMA: PL330: Remove redundant runtime_suspend/resume functions DMA: PL330: Remove controller clock enable/disable dmaengine: use kmem_cache_zalloc instead of kmem_cache_alloc/memset DMA: PL330: Set the capability of pdm0 and pdm1 as DMA_PRIVATE ARM: EXYNOS: Set the capability of pdm0 and pdm1 as DMA_PRIVATE dma: tegra: use list_move_tail instead of list_del/list_add_tail mxs/dma: Enlarge the CCW descriptor area to 4 pages dw_dmac: utilize slave_id to pass request line dmaengine: mmp_tdma: add dt support dmaengine: mmp-pdma support spi: davici - make davinci select edma ...		2012-10-10 11:10:41 +09:00
..
include/mach	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
headsmp.S	SPEAr13xx: Add source files	2012-05-14 17:34:05 +02:00
hotplug.c	ARM: consolidate pen_release instead of having per platform definitions	2012-09-14 11:15:01 +02:00
Kconfig	pinctrl: Add SPEAr13xx pinctrl drivers	2012-05-14 17:34:07 +02:00
Makefile	SPEAr13xx: Add source files	2012-05-14 17:34:05 +02:00
Makefile.boot	ARM: move all dtb targets out of Makefile.boot	2012-09-14 09:22:04 -05:00
platsmp.c	ARM: consolidate pen_release instead of having per platform definitions	2012-09-14 11:15:01 +02:00
spear13xx.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-10-10 11:10:41 +09:00
spear1310.c	ARM: SoC: convert spear13xx to SMP operations	2012-09-14 11:15:00 +02:00
spear1340.c	ARM: SoC: convert spear13xx to SMP operations	2012-09-14 11:15:00 +02:00