Skip to content
GitLab
Commit 8516f52f authored by Vinod Koul's avatar Vinod Koul Committed by Vinod Koul
Browse files

Merge branch 'next' into v3.1-rc4 



Fixed trivial conflicts  in  drivers/dma/amba-pl08x.c

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parents c6a389f1 7b4b88e0
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment