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

Merge branch 'v5.10/standard/base' into v5.10/standard/nxp-sdk-5.10/nxp-soc



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

# Conflicts:
#	arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
#	drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
#	drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
#	drivers/thermal/imx_thermal.c
parents f0e435f0 7db76b72
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