drm/nouveau/disp/nv04-nv40: abort scanoutpos query on vga analog.

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 778b527..b0420c6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2928,6 +2928,7 @@ L:        dri-devel@lists.freedesktop.org
 T:     git git://people.freedesktop.org/~airlied/linux
 S:     Maintained
 F:     drivers/gpu/drm/
+F:     drivers/gpu/vga/
 F:     include/drm/
 F:     include/uapi/drm/
 
@@ -7404,6 +7405,14 @@ F:       drivers/rpmsg/
 F:     Documentation/rpmsg.txt
 F:     include/linux/rpmsg.h
 
+RESET CONTROLLER FRAMEWORK
+M:     Philipp Zabel <p.zabel@pengutronix.de>
+S:     Maintained
+F:     drivers/reset/
+F:     Documentation/devicetree/bindings/reset/
+F:     include/linux/reset.h
+F:     include/linux/reset-controller.h
+
 RFKILL
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org