Merge branch 'topic/xilinx' into fixes
authorVinod Koul <vkoul@kernel.org>
Fri, 7 Aug 2020 05:43:37 +0000 (11:13 +0530)
committerVinod Koul <vkoul@kernel.org>
Fri, 7 Aug 2020 05:43:37 +0000 (11:13 +0530)
commit00043a2689232631f39ebbf6719d545b1d799086
tree0660e8e30210547562ad9132be0255b795453d73
parent0b5ad7b9522e6172342511fac6114fd8b7eb622a
parentbc227385eb71f2cb453efeddc053265bbd2525f9
Merge branch 'topic/xilinx' into fixes

 Conflicts:
Documentation/driver-api/dmaengine/provider.rst
include/linux/dmaengine.h
Documentation/driver-api/dmaengine/provider.rst
MAINTAINERS
drivers/dma/Kconfig
include/linux/dmaengine.h