]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4b3484a bc7787a)
Merge drm/drm-next into drm-misc-next
authorThomas Zimmermann <tzimmermann@suse.de>
Thu, 16 Dec 2021 13:47:38 +0000 (14:47 +0100)
committerThomas Zimmermann <tzimmermann@suse.de>
Thu, 16 Dec 2021 13:48:27 +0000 (14:48 +0100)
commit6145fd543809c7242d5b8f339b7e99806776b43b
tree44c1951f9fe4ded7f18d26ca677d006c0e191569tree | snapshot
parent4b3484abb95ed0d2ae682773a56ea02f32ebbb3ccommit | diff
parentbc7787a821f36ee59075977ad7dcc23f7f43ccfccommit | diff
Merge drm/drm-next into drm-misc-next

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 <tzimmermann@suse.de>
drivers/video/fbdev/simplefb.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.