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

Merge branch 'v5.10/standard/base' into v5.10/standard/preempt-rt/nxp-sdk-5.10/nxp-soc



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

# Conflicts:
#	drivers/net/phy/aquantia_main.c
parents b86d7a69 61d0d95f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment