]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 0b665d4 244a36e)
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)
commit9758ff2fa240173e9a45613b07774b7a78b7653e
tree44c1951f9fe4ded7f18d26ca677d006c0e191569tree
parent0b665d4af35837f0a0ae63135b84a3c187c1db3bcommit | diff
parent244a36e50da05c33b860d20638ee4628017a5334commit | 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
Unnamed repository; edit this file 'description' to name the repository.