diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-19 06:52:20 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-19 06:52:20 -1000 |
| commit | 9af1f5d8f20f97884da55817ab80a6fcd170f296 (patch) | |
| tree | bad9c34daa7c4e864e47b1a103b2442995279954 /MAINTAINERS | |
| parent | 049a40c0a2d4b458583161ec1b9ce109408cb1aa (diff) | |
| parent | 5156463588c3999b630d9ffc6061a54962f3c2d9 (diff) | |
| download | linux-9af1f5d8f20f97884da55817ab80a6fcd170f296.tar.bz2 | |
Merge tag 'dmaengine-fix-4.7-rc4' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"Some fixes has piled up, so time to send them upstream.
These fixes include:
- at_xdmac fixes for residue and other stuff
- update MAINTAINERS for dma dt bindings
- mv_xor fix for incorrect offset"
* tag 'dmaengine-fix-4.7-rc4' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: mv_xor: Fix incorrect offset in dma_map_page()
dmaengine: at_xdmac: double FIFO flush needed to compute residue
dmaengine: at_xdmac: fix residue corruption
dmaengine: at_xdmac: align descriptors on 64 bits
MAINTAINERS: Add file patterns for dma device tree bindings
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 98f8a5c92314..e1b090f86e0d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3778,6 +3778,7 @@ Q: https://patchwork.kernel.org/project/linux-dmaengine/list/ S: Maintained F: drivers/dma/ F: include/linux/dmaengine.h +F: Documentation/devicetree/bindings/dma/ F: Documentation/dmaengine/ T: git git://git.infradead.org/users/vkoul/slave-dma.git |