Skip to content
Commit 8c8cec3b 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:
#	arch/arm64/kernel/traps.c
#	drivers/gpu/drm/bridge/adv7511/adv7511.h
#	drivers/gpu/drm/bridge/adv7511/adv7533.c
#	drivers/gpu/drm/rockchip/cdn-dp-core.c
#	drivers/usb/dwc3/core.c
parents fa0b73c1 4121ef6a
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