aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'linus/master' into 3.12-rc7H. Nikolaus Schaller2013-10-281-0/+2
|\
| * dmaengine: edma: fix another memory leakVinod Koul2013-10-241-0/+1
| * dma: edma: Fix memory leakValentin Ilie2013-10-241-0/+1
* | Merge remote-tracking branch 'linus/master' for 3.12-rc5H. Nikolaus Schaller2013-10-142-4/+6
|\ \ | |/
| * dma: edma.c: remove edma_desc leakageGeyslan G. Bem2013-10-111-0/+1
| * rcar-hpbdma: add parameter to set_slave() methodSergei Shtylyov2013-10-111-2/+5
| * rcar-hpbdma: remove shdma_free_irq() callsSergei Shtylyov2013-10-111-2/+0
* | Merge branch 'linus' (3.12-rc4) into 3.12-wipH. Nikolaus Schaller2013-10-073-17/+17
|\ \ | |/
| * dmaengine: imx-dma: fix callback path in taskletMichael Grzeschik2013-10-041-4/+6
| * dmaengine: imx-dma: fix lockdep issue between irqhandler and taskletMichael Grzeschik2013-10-041-11/+8
| * dmaengine: imx-dma: fix slow path issue in prep_dma_cyclicMichael Grzeschik2013-10-041-1/+1
| * dma/Kconfig: Make TI_EDMA select TI_PRIV_EDMAJosh Boyer2013-09-171-0/+1
| * edma: Update author email addressJosh Boyer2013-09-171-1/+1
* | Merge remote-tracking branch 'linus/master' into 3.12-wipH. Nikolaus Schaller2013-09-141-1/+0
|\ \ | |/
| * Remove GENERIC_HARDIRQ config optionMartin Schwidefsky2013-09-131-1/+0
* | fixed merge conflictsH. Nikolaus Schaller2013-09-1238-636/+2941
|\ \ | |/
| * Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2013-09-1038-636/+2941
| |\
| | * dma: edma: Remove limits on number of slotsJoel Fernandes2013-09-041-6/+0
| | * dma: edma: Leave linked to Null slot instead of DUMMY slotJoel Fernandes2013-09-041-3/+8
| | * dma: edma: Find missed events and issue themJoel Fernandes2013-09-041-1/+49
| | * dma: edma: Write out and handle MAX_NR_SG at a given timeJoel Fernandes2013-09-041-26/+51
| | * dma: edma: Setup parameters to DMA MAX_NR_SG at a timeJoel Fernandes2013-09-041-3/+15
| | * Merge branch 'topic/api_caps' into for-linusVinod Koul2013-09-041-7/+8
| | |\
| | | * dmaengine: pl330: use dma_set_max_seg_size to set the sg limitVinod Koul2013-09-031-7/+8
| | * | Merge branch 'topic/sh' into for-linusVinod Koul2013-09-029-118/+232
| | |\ \
| | | * | DMA: shdma: fix a bad merge - remove free_irq()Guennadi Liakhovetski2013-08-271-5/+0
| | | * | dma: sh: remove unnecessary platform_set_drvdata()Jingoo Han2013-08-272-5/+0
| | | * | DMA: shdma: add r8a73a4 DMAC data to the device ID tableGuennadi Liakhovetski2013-08-275-0/+92
| | | * | DMA: shdma: add a header with common for ARM SoCs definesGuennadi Liakhovetski2013-08-271-0/+51
| | | * | DMA: shdma: remove private and unused defines from a global headerGuennadi Liakhovetski2013-08-271-0/+9
| | | * | DMA: shdma: switch DT mode to use configuration data from a match tableGuennadi Liakhovetski2013-08-276-21/+33
| | | * | DMA: shdma: make a pointer constGuennadi Liakhovetski2013-08-272-6/+6
| | | * | DMA: sudmac: fix compiler warningGuennadi Liakhovetski2013-08-271-2/+0
| | | * | DMA: shdma: switch to managed resource allocationGuennadi Liakhovetski2013-08-273-63/+15
| | | * | DMA: shdma: support the new CHCLR register layoutGuennadi Liakhovetski2013-08-271-2/+12
| | | * | DMA: shdma: switch all __iomem pointers to voidGuennadi Liakhovetski2013-08-252-14/+14
| | | * | DMA: shdma: fix CHCLR register address calculationGuennadi Liakhovetski2013-08-251-4/+4
| | * | | Merge branch 'topic/of' into for-linusVinod Koul2013-09-022-6/+7
| | |\ \ \
| | | * | | dma: of: make error message more meaningful by adding the node nameLothar Waßmann2013-08-191-1/+2
| | | * | | dmaengine: fix - error: potential NULL dereference 'chan'Vinod Koul2013-08-191-5/+5
| | * | | | Merge branch 'topic/api_caps' into for-linusVinod Koul2013-09-021-0/+27
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | dma: pl330: Implement device_slave_capsLars-Peter Clausen2013-07-151-0/+27
| | * | | | dma: replace devm_request_and_ioremap by devm_ioremap_resourceJulia Lawall2013-09-021-5/+5
| | * | | | dma: ste_dma40: Fix potential null pointer dereferenceSachin Kamat2013-09-021-0/+3
| | * | | | dma: ste_dma40: Remove duplicate constSachin Kamat2013-09-021-1/+1
| | * | | | dma: imx-dma: Remove redundant NULL checkSachin Kamat2013-09-021-4/+2
| | * | | | dma: dmagengine: fix function names in commentsDaniel Mack2013-09-021-2/+2
| | * | | | dma: add driver for R-Car HPB-DMACMax Filippov2013-09-023-0/+662
| | * | | | dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()Jingoo Han2013-09-021-3/+3
| | * | | | dma: imx-sdma: Staticize sdma_driver_data structuresFabio Estevam2013-09-021-6/+6