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

Merge branch 'v5.15/standard/preempt-rt/base' into v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc 



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

# Conflicts:
#	drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
parents 80268b48 c69881f9
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