Merge branch 'v5.10/standard/base' into v5.10/standard/nxp-sdk-5.10/nxp-soc
Signed-off-by:
Bruce 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
Loading
Please register or sign in to comment