| commit | 00043a2689232631f39ebbf6719d545b1d799086 | [log] [tgz] |
|---|---|---|
| author | Vinod Koul <vkoul@kernel.org> | Fri Aug 07 11:13:37 2020 +0530 |
| committer | Vinod Koul <vkoul@kernel.org> | Fri Aug 07 11:13:37 2020 +0530 |
| tree | 0660e8e30210547562ad9132be0255b795453d73 | |
| parent | 0b5ad7b9522e6172342511fac6114fd8b7eb622a [diff] | |
| parent | bc227385eb71f2cb453efeddc053265bbd2525f9 [diff] |
Merge branch 'topic/xilinx' into fixes Conflicts: Documentation/driver-api/dmaengine/provider.rst include/linux/dmaengine.h