diff options
| author | Vinod Koul <[email protected]> | 2020-08-07 05:43:37 +0000 |
|---|---|---|
| committer | Vinod Koul <[email protected]> | 2020-08-07 05:43:37 +0000 |
| commit | 00043a2689232631f39ebbf6719d545b1d799086 (patch) | |
| tree | 0660e8e30210547562ad9132be0255b795453d73 /drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | |
| parent | Merge branch 'for-linus' into fixes (diff) | |
| parent | dmaengine: xilinx: dpdma: Fix kerneldoc warning (diff) | |
| download | kernel-00043a2689232631f39ebbf6719d545b1d799086.tar.gz kernel-00043a2689232631f39ebbf6719d545b1d799086.zip | |
Merge branch 'topic/xilinx' into fixes
Conflicts:
Documentation/driver-api/dmaengine/provider.rst
include/linux/dmaengine.h
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c')
0 files changed, 0 insertions, 0 deletions