drm/ttm: pass man around instead of mem_type in some places

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 301330e..f12a868 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1448,11 +1448,6 @@ 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
@@ -5094,6 +5089,7 @@ F:        fs/dlm/
 
 DMA BUFFER SHARING FRAMEWORK
 M:     Sumit Semwal <sumit.semwal@linaro.org>
+M:     Christian König <christian.koenig@amd.com>
 L:     linux-media@vger.kernel.org
 L:     dri-devel@lists.freedesktop.org
 L:     linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
@@ -5410,7 +5406,7 @@ S:        Orphan / Obsolete
 F:     drivers/gpu/drm/mga/
 F:     include/uapi/drm/mga_drm.h
 
-DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
+DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
 M:     Dave Airlie <airlied@redhat.com>
 S:     Odd Fixes
 F:     drivers/gpu/drm/mgag200/
@@ -5819,7 +5815,7 @@ M:        Eric Anholt <eric@anholt.net>
 S:     Supported
 T:     git git://github.com/anholt/linux
 T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
+F:     Documentation/devicetree/bindings/display/brcm,bcm2835-*.yaml
 F:     drivers/gpu/drm/vc4/
 F:     include/uapi/drm/vc4_drm.h
 
@@ -14196,6 +14192,15 @@ L:     dmaengine@vger.kernel.org
 S:     Supported
 F:     drivers/dma/qcom/hidma*
 
+QUALCOMM I2C CCI DRIVER
+M:     Loic Poulain <loic.poulain@linaro.org>
+M:     Robert Foss <robert.foss@linaro.org>
+L:     linux-i2c@vger.kernel.org
+L:     linux-arm-msm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt
+F:     drivers/i2c/busses/i2c-qcom-cci.c
+
 QUALCOMM IOMMU
 M:     Rob Clark <robdclark@gmail.com>
 L:     iommu@lists.linux-foundation.org