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

Merge branch 'v5.15/standard/base' into v5.15/standard/nxp-sdk-5.15/nxp-soc



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

# Conflicts:
#	drivers/input/keyboard/snvs_pwrkey.c
#	drivers/net/phy/aquantia_main.c
#	drivers/reset/reset-imx7.c
#	drivers/tty/serial/fsl_lpuart.c
parents 3228077b 0b628306
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