Merge branch 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux into...

[mirror_ubuntu-bionic-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6671f375f7fcdd1cf9e40f62c884f1ef9592dab9..fe121ea1ab99ed2ceb4f38d34122cd5e6d8a8cc5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4366,6 +4366,12 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/bochs/
 
+DRM DRIVER FOR FARADAY TVE200 TV ENCODER
+M:     Linus Walleij <linus.walleij@linaro.org>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/tve200/
+
 DRM DRIVER FOR INTEL I810 VIDEO CARDS
 S:     Orphan / Obsolete
 F:     drivers/gpu/drm/i810/
@@ -4509,7 +4515,7 @@ L:        dri-devel@lists.freedesktop.org
 S:     Supported
 F:     drivers/gpu/drm/sun4i/
 F:     Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR AMLOGIC SOCS
 M:     Neil Armstrong <narmstrong@baylibre.com>
@@ -4693,7 +4699,7 @@ T:        git git://anongit.freedesktop.org/drm/drm-misc
 DRM PANEL DRIVERS
 M:     Thierry Reding <thierry.reding@gmail.com>
 L:     dri-devel@lists.freedesktop.org
-T:     git git://anongit.freedesktop.org/tegra/linux.git
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/drm_panel.c
 F:     drivers/gpu/drm/panel/
@@ -5455,6 +5461,7 @@ F:        drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
 M:     Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+L:     dri-devel@lists.freedesktop.org
 L:     linux-fbdev@vger.kernel.org
 T:     git git://github.com/bzolnier/linux.git
 Q:     http://patchwork.kernel.org/project/linux-fbdev/list/
@@ -8597,6 +8604,12 @@ M:       Sean Wang <sean.wang@mediatek.com>
 S:     Maintained
 F:     drivers/media/rc/mtk-cir.c
 
+MEDIATEK PMIC LED DRIVER
+M:     Sean Wang <sean.wang@mediatek.com>
+S:     Maintained
+F:     drivers/leds/leds-mt6323.c
+F:     Documentation/devicetree/bindings/leds/leds-mt6323.txt
+
 MEDIATEK ETHERNET DRIVER
 M:     Felix Fietkau <nbd@openwrt.org>
 M:     John Crispin <john@phrozen.org>