From: Dave Airlie <airlied@redhat.com>
Date: Tue, 6 Oct 2020 02:34:58 +0000 (+1000)
Subject: Merge tag 'drm-misc-fixes-2020-10-01' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: howlett/maple_spf/20210104~933^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=86fdf61e71046618f6f499542cee12f2348c523c;p=users%2Fjedix%2Flinux-maple.git

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
---

86fdf61e71046618f6f499542cee12f2348c523c