]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7395fa00f98a0271eb8c724e79c799f83d7d1ce4
tree0660e8e30210547562ad9132be0255b795453d73
parent78dda5cfee59edc5cf86febe1643509c796a8b4e
parentd509d4cb2a05dd98b40ab5ae55ae875f9378d779
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