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

Merge branch 'v6.1/standard/base' into v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc 



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

# Conflicts:
#	arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi
parents 7328cca8 c35e45ea
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment