diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-08-07 08:43:37 +0300 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-08-07 08:43:37 +0300 |
| commit | 00043a2689232631f39ebbf6719d545b1d799086 (patch) | |
| tree | 0660e8e30210547562ad9132be0255b795453d73 /sound/parisc | |
| parent | 0b5ad7b9522e6172342511fac6114fd8b7eb622a (diff) | |
| parent | bc227385eb71f2cb453efeddc053265bbd2525f9 (diff) | |
| download | linux-00043a2689232631f39ebbf6719d545b1d799086.tar.xz | |
Merge branch 'topic/xilinx' into fixes
Conflicts:
Documentation/driver-api/dmaengine/provider.rst
include/linux/dmaengine.h
Diffstat (limited to 'sound/parisc')
0 files changed, 0 insertions, 0 deletions