Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[uclinux-h8/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index da636ea..29d9779 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -847,6 +847,12 @@ S: Maintained
 F:     drivers/net/arcnet/
 F:     include/uapi/linux/if_arcnet.h
 
+ARM HDLCD DRM DRIVER
+M:     Liviu Dudau <liviu.dudau@arm.com>
+S:     Supported
+F:     drivers/gpu/drm/arm/
+F:     Documentation/devicetree/bindings/display/arm,hdlcd.txt
+
 ARM MFM AND FLOPPY DRIVERS
 M:     Ian Molton <spyro@f2s.com>
 S:     Maintained
@@ -3754,7 +3760,7 @@ F:        drivers/gpu/vga/
 F:     include/drm/
 F:     include/uapi/drm/
 
-RADEON DRM DRIVERS
+RADEON and AMDGPU DRM DRIVERS
 M:     Alex Deucher <alexander.deucher@amd.com>
 M:     Christian König <christian.koenig@amd.com>
 L:     dri-devel@lists.freedesktop.org
@@ -3762,6 +3768,8 @@ T:        git git://people.freedesktop.org/~agd5f/linux
 S:     Supported
 F:     drivers/gpu/drm/radeon/
 F:     include/uapi/drm/radeon*
+F:     drivers/gpu/drm/amd/
+F:     include/uapi/drm/amdgpu*
 
 DRM PANEL DRIVERS
 M:     Thierry Reding <thierry.reding@gmail.com>
@@ -3806,7 +3814,7 @@ F:        include/drm/exynos*
 F:     include/uapi/drm/exynos*
 
 DRM DRIVERS FOR FREESCALE DCU
-M:     Jianwei Wang <jianwei.wang.chn@gmail.com>
+M:     Stefan Agner <stefan@agner.ch>
 M:     Alison Wang <alison.wang@freescale.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Supported