X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=MAINTAINERS;h=1e14f7b70f2fd8852a2bdfd80c90e73590326985;hb=9ab6d90b80c446d961f4ab7ced8b6329dea4fe66;hp=2f5cf3d03621d4db8c3d8149d95d906a7e961a0a;hpb=36025a812eebb34a478cfc1d3a538472591498b0;p=~andy%2Flinux

diff --git a/MAINTAINERS b/MAINTAINERS
index 2f5cf3d0362..1e14f7b70f2 100644
--- 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
@@ -4576,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
@@ -5471,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/