diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-18 17:47:07 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-18 17:47:07 +0200 |
| commit | 7ec6a8dab8b257943b7711e8e87b8a8830b4f59e (patch) | |
| tree | 4c3c3a180f656fe32786a39ca7ac256141c2c874 /MAINTAINERS | |
| parent | e1ab74623721da21eee91cb22b5824aa7d0c0d5b (diff) | |
| parent | a874aba8bbc529517ed154d88b08e3c437564c88 (diff) | |
Merge remote-tracking branch 'drm_misc_push/drm-misc-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/amd/amdgpu/amdgpu.h
# drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
# drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
# drivers/gpu/drm/drm_gem.c
# include/drm/ttm/ttm_resource.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index abfb59afd06d..78b8f2038ce8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6082,7 +6082,8 @@ L: dri-devel@lists.freedesktop.org T: git git://anongit.freedesktop.org/drm/drm-misc S: Maintained F: drivers/gpu/drm/panel/panel-lvds.c -F: Documentation/devicetree/bindings/display/panel/lvds.yaml +F: Documentation/devicetree/bindings/display/lvds.yaml +F: Documentation/devicetree/bindings/display/panel/panel-lvds.yaml DRM DRIVER FOR MANTIX MLAF057WE51 PANELS M: Guido Günther <agx@sigxcpu.org> @@ -6167,6 +6168,13 @@ T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/devicetree/bindings/display/repaper.txt F: drivers/gpu/drm/tiny/repaper.c +DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS +M: Javier Martinez Canillas <javierm@redhat.com> +S: Maintained +T: git git://anongit.freedesktop.org/drm/drm-misc +F: Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml +F: drivers/gpu/drm/solomon/ssd130x* + DRM DRIVER FOR QEMU'S CIRRUS DEVICE M: Dave Airlie <airlied@redhat.com> M: Gerd Hoffmann <kraxel@redhat.com> |