Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 73a8b561414b8ae657f5f9975b194ffa520ffd78..5ccca1ca0077cfda84d5ec712b6aaeb3f194531f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5598,14 +5598,13 @@ F:      net/rds/
 READ-COPY UPDATE (RCU)
 M:     Dipankar Sarma <dipankar@in.ibm.com>
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
-W:     http://www.rdrop.com/users/paulmck/rclock/
+W:     http://www.rdrop.com/users/paulmck/RCU/
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:     Documentation/RCU/
+X:     Documentation/RCU/torture.txt
 F:     include/linux/rcu*
-F:     include/linux/srcu*
 F:     kernel/rcu*
-F:     kernel/srcu*
 X:     kernel/rcutorture.c
 
 REAL TIME CLOCK (RTC) SUBSYSTEM
@@ -6122,6 +6121,15 @@ S:       Maintained
 F:     include/linux/sl?b*.h
 F:     mm/sl?b.c
 
+SLEEPABLE READ-COPY UPDATE (SRCU)
+M:     Lai Jiangshan <laijs@cn.fujitsu.com>
+M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+W:     http://www.rdrop.com/users/paulmck/RCU/
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+F:     include/linux/srcu*
+F:     kernel/srcu*
+
 SMC91x ETHERNET DRIVER
 M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Odd Fixes