Skip to content
Commit 3efffa8d authored by Bruce Ashfield's avatar Bruce Ashfield
Browse files

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



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

# Conflicts:
#	drivers/net/ethernet/xilinx/xilinx_axienet_main.c
parents bd4898b6 7db76b72
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