diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 14:13:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 14:13:42 -0400 |
commit | 79637a41e466bbe7dfe394bac3c9d86a92fd55b1 (patch) | |
tree | 0ee720d20572a3e1f901f78331b57612984f1e2e /MAINTAINERS | |
parent | 899edae615c806f78880077bd46f04d7f23ae6e6 (diff) | |
parent | b3bd3de66f60df4c9a2076e2886a622458929056 (diff) |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
gcc-4.6: kernel/*: Fix unused but set warnings
mutex: Fix annotations to include it in kernel-locking docbook
pid: make setpgid() system call use RCU read-side critical section
MAINTAINERS: Add RCU's public git tree
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 087912aa09bd..7e189b57c8b5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4810,6 +4810,7 @@ RCUTORTURE MODULE | |||
4810 | M: Josh Triplett <josh@freedesktop.org> | 4810 | M: Josh Triplett <josh@freedesktop.org> |
4811 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> | 4811 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> |
4812 | S: Supported | 4812 | S: Supported |
4813 | T: git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git | ||
4813 | F: Documentation/RCU/torture.txt | 4814 | F: Documentation/RCU/torture.txt |
4814 | F: kernel/rcutorture.c | 4815 | F: kernel/rcutorture.c |
4815 | 4816 | ||
@@ -4834,6 +4835,7 @@ M: Dipankar Sarma <dipankar@in.ibm.com> | |||
4834 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> | 4835 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> |
4835 | W: http://www.rdrop.com/users/paulmck/rclock/ | 4836 | W: http://www.rdrop.com/users/paulmck/rclock/ |
4836 | S: Supported | 4837 | S: Supported |
4838 | T: git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git | ||
4837 | F: Documentation/RCU/ | 4839 | F: Documentation/RCU/ |
4838 | F: include/linux/rcu* | 4840 | F: include/linux/rcu* |
4839 | F: include/linux/srcu* | 4841 | F: include/linux/srcu* |