Skip to content
Snippets Groups Projects
Commit 02189ca8 authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge drm/drm-next into drm-intel-next

Sync the branches to resolve the conflict reported in the below link.

Link: https://lore.kernel.org/r/20240906131502.7a7d1962@canb.auug.org.au


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parents 54df34c5 b615b9c3
No related branches found
No related tags found
No related merge requests found
Showing
with 200 additions and 134 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment