]> www.infradead.org Git - nvme.git/commitdiff
projects / nvme.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>
1  2 
drivers/video/fbdev/simplefb.c patch | diff1 | diff2 | blob | history

diff --cc drivers/video/fbdev/simplefb.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.