]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 931168d 9938b1c)
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)
commit2357dc2bbfeb540b2511d9f3ca23798f70da852b
tree44c1951f9fe4ded7f18d26ca677d006c0e191569tree | snapshot
parent931168d530f04691626a124fc7c18b2ef39a7f7ecommit | diff
parent9938b1ca0dcd598f6455ad40591a945e7b7a806bcommit | 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.