Merge branch 'v6.1/standard/base' into v6.1/standard/ti-sdk-6.1/ti-j7xxx
Signed-off-by: 
Bruce Ashfield <bruce.ashfield@gmail.com>
# Conflicts:
# drivers/gpu/drm/tidss/tidss_crtc.c
Loading
Please register or sign in to comment
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
# Conflicts:
# drivers/gpu/drm/tidss/tidss_crtc.c