Staging: comedi: move while to same line as } in do loops

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fb94add..1e14f7b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1544,6 +1544,7 @@ L:        containers@lists.linux-foundation.org
 S:     Maintained
 F:     include/linux/cgroup*
 F:     kernel/cgroup*
+F:     mm/*cgroup*
 
 CORETEMP HARDWARE MONITORING DRIVER
 P:     Rudolf Marek
@@ -2274,11 +2275,9 @@ F:       drivers/net/wan/dlci.c
 F:     drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
-P:     Antonino Daplas
-M:     adaplas@gmail.com
 L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://linux-fbdev.sourceforge.net/
-S:     Maintained
+S:     Orphan
 F:     Documentation/fb/
 F:     drivers/video/fb*
 F:     include/linux/fb.h
@@ -4578,6 +4577,13 @@ S:       Maintained
 F:     drivers/net/pppol2tp.c
 F:     include/linux/if_pppol2tp.h
 
+PPS SUPPORT
+P:     Rodolfo Giometti
+M:     giometti@enneenne.com
+W:     http://wiki.enneenne.com/index.php/LinuxPPS_support
+L:     linuxpps@ml.enneenne.com (subscribers-only)
+S:     Maintained
+
 PREEMPTIBLE KERNEL
 P:     Robert Love
 M:     rml@tech9.net
@@ -5473,6 +5479,7 @@ STAGING SUBSYSTEM
 P:     Greg Kroah-Hartman
 M:     gregkh@suse.de
 T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+L:     devel@driverdev.osuosl.org
 S:     Maintained
 F:     drivers/staging/