Skip to content
Commit 2f7957e8 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:
#	arch/arm/boot/dts/imx6dl.dtsi
#	arch/arm/boot/dts/imx6q.dtsi
#	arch/arm/boot/dts/imx6sl.dtsi
#	arch/arm/boot/dts/imx6sll.dtsi
#	arch/arm/boot/dts/imx6sx.dtsi
#	drivers/tty/serial/fsl_lpuart.c
parents c99dc1c9 c2d428c7
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