Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26
[linux-2.6.git] / MAINTAINERS
index 22d688c..45b86ab 100644 (file)
@@ -2310,6 +2310,12 @@ L:       linux-kernel@vger.kernel.org
 L:     kexec@lists.infradead.org
 S:     Maintained
 
+KGDB
+P:     Jason Wessel
+M:     jason.wessel@windriver.com
+L:     kgdb-bugreport@lists.sourceforge.net
+S:     Maintained
+
 KPROBES
 P:     Ananth N Mavinakayanahalli
 M:     ananth@in.ibm.com
@@ -2937,6 +2943,7 @@ P:        Joel Becker
 M:     joel.becker@oracle.com
 L:     ocfs2-devel@oss.oracle.com
 W:     http://oss.oracle.com/projects/ocfs2/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
 S:     Supported
 
 OMNIKEY CARDMAN 4000 DRIVER