tree 0660e8e30210547562ad9132be0255b795453d73
parent 0b5ad7b9522e6172342511fac6114fd8b7eb622a
parent bc227385eb71f2cb453efeddc053265bbd2525f9
author Vinod Koul <vkoul@kernel.org> 1596779017 +0530
committer Vinod Koul <vkoul@kernel.org> 1596779017 +0530

Merge branch 'topic/xilinx' into fixes

 Conflicts:
	Documentation/driver-api/dmaengine/provider.rst
	include/linux/dmaengine.h