Merge commit 'v2.6.33' into core/rcu

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2533fc4..2123f6a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4509,7 +4509,7 @@ F:        drivers/net/wireless/ray*
 RCUTORTURE MODULE
 M:     Josh Triplett <josh@freedesktop.org>
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
-S:     Maintained
+S:     Supported
 F:     Documentation/RCU/torture.txt
 F:     kernel/rcutorture.c
 
@@ -4534,11 +4534,12 @@ M:      Dipankar Sarma <dipankar@in.ibm.com>
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 W:     http://www.rdrop.com/users/paulmck/rclock/
 S:     Supported
-F:     Documentation/RCU/rcu.txt
-F:     Documentation/RCU/rcuref.txt
-F:     include/linux/rcupdate.h
-F:     include/linux/srcu.h
-F:     kernel/rcupdate.c
+F:     Documentation/RCU/
+F:     include/linux/rcu*
+F:     include/linux/srcu*
+F:     kernel/rcu*
+F:     kernel/srcu*
+X:     kernel/rcutorture.c
 
 REAL TIME CLOCK DRIVER
 M:     Paul Gortmaker <p_gortmaker@yahoo.com>