Skip to content
Commit 48b872a5 authored by Bruce Ashfield's avatar Bruce Ashfield
Browse files

Merge branch 'v6.1/standard/base' into v6.1/standard/sdkv6.1/xlnx-soc 



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

# Conflicts:
#	drivers/spi/spi-cadence-quadspi.c
parents 4a7e1ac4 682b17e1
Hide 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