Skip to content
Commit 32f7177f authored by Bruce Ashfield's avatar Bruce Ashfield
Browse files

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



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

# Conflicts:
#	drivers/spi/spi-zynqmp-gqspi.c
parents 0d3507ce 5601201f
Hide whitespace changes
Inline Side-by-side
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