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

Merge branch 'v5.15/standard/base' into v5.15/standard/bcm-2xxx-rpi 



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

# Conflicts:
#	drivers/gpu/drm/vc4/vc4_hdmi.c
parents 11820566 9399d814
Hide whitespace changes
Inline Side-by-side
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