]> Git Repo - linux.git/commitdiff
Merge drm/drm-next into drm-misc-next
authorThomas Zimmermann <[email protected]>
Thu, 16 Dec 2021 13:47:38 +0000 (14:47 +0100)
committerThomas Zimmermann <[email protected]>
Thu, 16 Dec 2021 13:48:27 +0000 (14:48 +0100)
Backmerging for v5.16-rc5. Resolves a conflict between drm-misc-next
and drm-misc-fixes in the vc4 driver.

Signed-off-by: Thomas Zimmermann <[email protected]>
1  2 
drivers/video/fbdev/simplefb.c

Simple merge
This page took 0.063986 seconds and 4 git commands to generate.