aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-03 17:33:42 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-03 17:33:42 -0400
commit3bb5da3837cc1aa17736b05139c9a22c3794851a (patch)
treec92d5684a866542b1cb20641607ac1643ce03a47 /MAINTAINERS
parent7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff)
parent9597362d354f8655ece324b01d0c640a0e99c077 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS18
1 files changed, 12 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index fc7365cdc8da..c6ade7e777f3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -163,6 +163,12 @@ M: A2232@gmx.net
163L: linux-m68k@lists.linux-m68k.org 163L: linux-m68k@lists.linux-m68k.org
164S: Maintained 164S: Maintained
165 165
166AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN
167P: David Howells
168M: dhowells@redhat.com
169L: linux-afs@lists.infradead.org
170S: Supported
171
166AIO 172AIO
167P: Benjamin LaHaise 173P: Benjamin LaHaise
168M: bcrl@kvack.org 174M: bcrl@kvack.org
@@ -452,7 +458,7 @@ S: Maintained
452 458
453ARM/ATMEL AT91RM9200 ARM ARCHITECTURE 459ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
454P: Andrew Victor 460P: Andrew Victor
455M: andrew@sanpeople.com 461M: linux@maxim.org.za
456L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 462L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
457W: http://maxim.org.za/at91_26.html 463W: http://maxim.org.za/at91_26.html
458S: Maintained 464S: Maintained
@@ -2305,14 +2311,14 @@ L: kexec@lists.infradead.org
2305S: Maintained 2311S: Maintained
2306 2312
2307KPROBES 2313KPROBES
2308P: Prasanna S Panchamukhi
2309M: prasanna@in.ibm.com
2310P: Ananth N Mavinakayanahalli 2314P: Ananth N Mavinakayanahalli
2311M: ananth@in.ibm.com 2315M: ananth@in.ibm.com
2312P: Anil S Keshavamurthy 2316P: Anil S Keshavamurthy
2313M: anil.s.keshavamurthy@intel.com 2317M: anil.s.keshavamurthy@intel.com
2314P: David S. Miller 2318P: David S. Miller
2315M: davem@davemloft.net 2319M: davem@davemloft.net
2320P: Masami Hiramatsu
2321M: mhiramat@redhat.com
2316L: linux-kernel@vger.kernel.org 2322L: linux-kernel@vger.kernel.org
2317S: Maintained 2323S: Maintained
2318 2324
@@ -2926,9 +2932,9 @@ S: Maintained
2926 2932
2927ORACLE CLUSTER FILESYSTEM 2 (OCFS2) 2933ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
2928P: Mark Fasheh 2934P: Mark Fasheh
2929M: mark.fasheh@oracle.com 2935M: mfasheh@suse.com
2930P: Kurt Hackel 2936P: Joel Becker
2931M: kurt.hackel@oracle.com 2937M: joel.becker@oracle.com
2932L: ocfs2-devel@oss.oracle.com 2938L: ocfs2-devel@oss.oracle.com
2933W: http://oss.oracle.com/projects/ocfs2/ 2939W: http://oss.oracle.com/projects/ocfs2/
2934S: Supported 2940S: Supported