aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS12
1 files changed, 9 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 73883b8bbd76..90dcbbcad91c 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
@@ -2110,7 +2116,7 @@ M: reinette.chatre@intel.com
2110L: linux-wireless@vger.kernel.org 2116L: linux-wireless@vger.kernel.org
2111L: ipw3945-devel@lists.sourceforge.net 2117L: ipw3945-devel@lists.sourceforge.net
2112W: http://intellinuxwireless.org 2118W: http://intellinuxwireless.org
2113T: git git://intellinuxwireless.org/repos/iwlwifi 2119T: git git://git.kernel.org/pub/scm/linux/kernel/git/rchatre/iwlwifi-2.6.git
2114S: Supported 2120S: Supported
2115 2121
2116IOC3 ETHERNET DRIVER 2122IOC3 ETHERNET DRIVER
@@ -2314,14 +2320,14 @@ L: kexec@lists.infradead.org
2314S: Maintained 2320S: Maintained
2315 2321
2316KPROBES 2322KPROBES
2317P: Prasanna S Panchamukhi
2318M: prasanna@in.ibm.com
2319P: Ananth N Mavinakayanahalli 2323P: Ananth N Mavinakayanahalli
2320M: ananth@in.ibm.com 2324M: ananth@in.ibm.com
2321P: Anil S Keshavamurthy 2325P: Anil S Keshavamurthy
2322M: anil.s.keshavamurthy@intel.com 2326M: anil.s.keshavamurthy@intel.com
2323P: David S. Miller 2327P: David S. Miller
2324M: davem@davemloft.net 2328M: davem@davemloft.net
2329P: Masami Hiramatsu
2330M: mhiramat@redhat.com
2325L: linux-kernel@vger.kernel.org 2331L: linux-kernel@vger.kernel.org
2326S: Maintained 2332S: Maintained
2327 2333