diff options
| author |   Vinod Koul <vkoul@kernel.org> | 2020-08-07 11:13:37 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-08-07 11:13:37 +0530 |
| commit | 00043a2689232631f39ebbf6719d545b1d799086 (patch) | |
| tree | 0660e8e30210547562ad9132be0255b795453d73 /include/linux/mfd/git:/ssh:/git@git.zx2c4.com | |
| parent | Merge branch 'for-linus' into fixes (diff) | |
| parent | dmaengine: xilinx: dpdma: Fix kerneldoc warning (diff) | |
| download | linux-dev-00043a2689232631f39ebbf6719d545b1d799086.tar.xz linux-dev-00043a2689232631f39ebbf6719d545b1d799086.zip | |
Merge branch 'topic/xilinx' into fixes
Conflicts:
Documentation/driver-api/dmaengine/provider.rst
include/linux/dmaengine.h
Diffstat (limited to 'include/linux/mfd/git:/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions