diff options
author | Dave Airlie <airlied@redhat.com> | 2020-10-06 05:34:58 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-10-06 05:38:28 +0300 |
commit | 86fdf61e71046618f6f499542cee12f2348c523c (patch) | |
tree | ca4e67019e5442a02f804ebccf1687cac095077a /MAINTAINERS | |
parent | 549738f15da0e5a00275977623be199fbbf7df50 (diff) | |
parent | 27204b99b08289d0993cb77c22470034b5eb974d (diff) | |
download | linux-86fdf61e71046618f6f499542cee12f2348c523c.tar.xz |
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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 33b27e62ce19..ec6fa6e49933 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1460,6 +1460,11 @@ S: Odd Fixes F: drivers/amba/ F: include/linux/amba/bus.h +ARM PRIMECELL CLCD PL110 DRIVER +M: Russell King <linux@armlinux.org.uk> +S: Odd Fixes +F: drivers/video/fbdev/amba-clcd.* + ARM PRIMECELL KMI PL050 DRIVER M: Russell King <linux@armlinux.org.uk> S: Odd Fixes |