Merge Linus master into drm-next

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index db335f98cad02316e89c29b72ec89aa0860a8947..ce3eb0faffe62f9c9ba86663e0ae2b952144d6c4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3417,7 +3417,6 @@ T:        git git://people.freedesktop.org/~airlied/linux
 S:     Supported
 F:     drivers/gpu/drm/rcar-du/
 F:     drivers/gpu/drm/shmobile/
-F:     include/linux/platform_data/rcar-du.h
 F:     include/linux/platform_data/shmob_drm.h
 
 DSBR100 USB FM RADIO DRIVER