]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'drm-misc-fixes-2020-10-01' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Tue, 6 Oct 2020 02:34:58 +0000 (12:34 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 6 Oct 2020 02:38:28 +0000 (12:38 +1000)
commit86fdf61e71046618f6f499542cee12f2348c523c
treeca4e67019e5442a02f804ebccf1687cac095077a
parent549738f15da0e5a00275977623be199fbbf7df50
parent27204b99b08289d0993cb77c22470034b5eb974d
Merge tag 'drm-misc-fixes-2020-10-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

drm-misc-fixes for v5.9:
- Small doc fix.
- Re-add FB_ARMCLCD for android.
- Fix global-out-of-bounds read in fbcon_get_font().

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8585daa2-fcbc-3924-ac4f-e7b5668808e0@linux.intel.com
MAINTAINERS
drivers/video/fbdev/core/fbcon.c
drivers/video/fbdev/core/fbcon.h
drivers/video/fbdev/core/tileblit.c