diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-04-05 17:15:55 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-04-05 17:15:55 +0200 |
| commit | 8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd (patch) | |
| tree | bc08b79fe11c4745434da1cebc5fb8936f9c6831 /Documentation/devicetree/bindings/dma/fsl-edma.txt | |
| parent | shdma: add R-Car Audio DMAC peri peri driver (diff) | |
| parent | dmaengine: add Qualcomm BAM dma driver (diff) | |
| download | linux-8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd.tar.xz linux-8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd.zip | |
Merge branch 'topic/bam' into for-linus
Conflicts:
drivers/dma/Makefile
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'Documentation/devicetree/bindings/dma/fsl-edma.txt')
0 files changed, 0 insertions, 0 deletions