Merge branch 'topic/xilinx' into fixes
Conflicts: Documentation/driver-api/dmaengine/provider.rst include/linux/dmaengine.h
Showing
Please register or sign in to comment
Conflicts: Documentation/driver-api/dmaengine/provider.rst include/linux/dmaengine.h