Skip to content
Commit 98acbf0b authored by Bruce Ashfield's avatar Bruce Ashfield
Browse files

Merge branch 'v5.15/standard/base' into v5.15/standard/sdkv5.15/xlnx-soc 



Signed-off-by: default avatarBruce Ashfield <bruce.ashfield@gmail.com>

# Conflicts:
#	drivers/fpga/of-fpga-region.c
parents c66f812f d973ca5c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment