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

Merge branch 'v5.15/standard/base' into v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx



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

# Conflicts:
#	drivers/net/ethernet/ti/am65-cpsw-nuss.c
parents fe24e3f7 f0d16a14
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment