Skip to content
Snippets Groups Projects
Commit 00043a26 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/xilinx' into fixes

 Conflicts:
	Documentation/driver-api/dmaengine/provider.rst
	include/linux/dmaengine.h
parents 0b5ad7b9 bc227385
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment