aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-23 14:47:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-23 14:47:02 -0400
commit5f05647dd81c11a6a165ccc8f0c1370b16f3bcb0 (patch)
tree7851ef1c93aa1aba7ef327ca4b75fd35e6d10f29 /MAINTAINERS
parent02f36038c568111ad4fc433f6fa760ff5e38fab4 (diff)
parentec37a48d1d16c30b655ac5280209edf52a6775d4 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits) bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL. vlan: Calling vlan_hwaccel_do_receive() is always valid. tproxy: use the interface primary IP address as a default value for --on-ip tproxy: added IPv6 support to the socket match cxgb3: function namespace cleanup tproxy: added IPv6 support to the TPROXY target tproxy: added IPv6 socket lookup function to nf_tproxy_core be2net: Changes to use only priority codes allowed by f/w tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled tproxy: added tproxy sockopt interface in the IPV6 layer tproxy: added udp6_lib_lookup function tproxy: added const specifiers to udp lookup functions tproxy: split off ipv6 defragmentation to a separate module l2tp: small cleanup nf_nat: restrict ICMP translation for embedded header can: mcp251x: fix generation of error frames can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set can-raw: add msg_flags to distinguish local traffic 9p: client code cleanup rds: make local functions/variables static ... Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and drivers/net/wireless/ath/ath9k/debug.c as per David
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS62
1 files changed, 53 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9a0432de9141..494e1a07366a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1151,6 +1151,13 @@ W: http://wireless.kernel.org/en/users/Drivers/ar9170
1151S: Maintained 1151S: Maintained
1152F: drivers/net/wireless/ath/ar9170/ 1152F: drivers/net/wireless/ath/ar9170/
1153 1153
1154CARL9170 LINUX COMMUNITY WIRELESS DRIVER
1155M: Christian Lamparter <chunkeey@googlemail.com>
1156L: linux-wireless@vger.kernel.org
1157W: http://wireless.kernel.org/en/users/Drivers/carl9170
1158S: Maintained
1159F: drivers/net/wireless/ath/carl9170/
1160
1154ATK0110 HWMON DRIVER 1161ATK0110 HWMON DRIVER
1155M: Luca Tettamanti <kronos.it@gmail.com> 1162M: Luca Tettamanti <kronos.it@gmail.com>
1156L: lm-sensors@lm-sensors.org 1163L: lm-sensors@lm-sensors.org
@@ -1375,16 +1382,19 @@ F: drivers/mtd/devices/block2mtd.c
1375 1382
1376BLUETOOTH DRIVERS 1383BLUETOOTH DRIVERS
1377M: Marcel Holtmann <marcel@holtmann.org> 1384M: Marcel Holtmann <marcel@holtmann.org>
1385M: Gustavo F. Padovan <padovan@profusion.mobi>
1378L: linux-bluetooth@vger.kernel.org 1386L: linux-bluetooth@vger.kernel.org
1379W: http://www.bluez.org/ 1387W: http://www.bluez.org/
1388T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
1380S: Maintained 1389S: Maintained
1381F: drivers/bluetooth/ 1390F: drivers/bluetooth/
1382 1391
1383BLUETOOTH SUBSYSTEM 1392BLUETOOTH SUBSYSTEM
1384M: Marcel Holtmann <marcel@holtmann.org> 1393M: Marcel Holtmann <marcel@holtmann.org>
1394M: Gustavo F. Padovan <padovan@profusion.mobi>
1385L: linux-bluetooth@vger.kernel.org 1395L: linux-bluetooth@vger.kernel.org
1386W: http://www.bluez.org/ 1396W: http://www.bluez.org/
1387T: git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git 1397T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
1388S: Maintained 1398S: Maintained
1389F: net/bluetooth/ 1399F: net/bluetooth/
1390F: include/net/bluetooth/ 1400F: include/net/bluetooth/
@@ -1429,6 +1439,13 @@ L: linux-scsi@vger.kernel.org
1429S: Supported 1439S: Supported
1430F: drivers/scsi/bfa/ 1440F: drivers/scsi/bfa/
1431 1441
1442BROCADE BNA 10 GIGABIT ETHERNET DRIVER
1443M: Rasesh Mody <rmody@brocade.com>
1444M: Debashis Dutt <ddutt@brocade.com>
1445L: netdev@vger.kernel.org
1446S: Supported
1447F: drivers/net/bna/
1448
1432BSG (block layer generic sg v4 driver) 1449BSG (block layer generic sg v4 driver)
1433M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> 1450M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
1434L: linux-scsi@vger.kernel.org 1451L: linux-scsi@vger.kernel.org
@@ -1586,9 +1603,9 @@ S: Supported
1586F: scripts/checkpatch.pl 1603F: scripts/checkpatch.pl
1587 1604
1588CISCO VIC ETHERNET NIC DRIVER 1605CISCO VIC ETHERNET NIC DRIVER
1589M: Scott Feldman <scofeldm@cisco.com>
1590M: Vasanthy Kolluri <vkolluri@cisco.com> 1606M: Vasanthy Kolluri <vkolluri@cisco.com>
1591M: Roopa Prabhu <roprabhu@cisco.com> 1607M: Roopa Prabhu <roprabhu@cisco.com>
1608M: David Wang <dwang2@cisco.com>
1592S: Supported 1609S: Supported
1593F: drivers/net/enic/ 1610F: drivers/net/enic/
1594 1611
@@ -2922,6 +2939,12 @@ M: Brian King <brking@us.ibm.com>
2922S: Supported 2939S: Supported
2923F: drivers/scsi/ipr.* 2940F: drivers/scsi/ipr.*
2924 2941
2942IBM Power Virtual Ethernet Device Driver
2943M: Santiago Leon <santil@linux.vnet.ibm.com>
2944L: netdev@vger.kernel.org
2945S: Supported
2946F: drivers/net/ibmveth.*
2947
2925IBM ServeRAID RAID DRIVER 2948IBM ServeRAID RAID DRIVER
2926P: Jack Hammer 2949P: Jack Hammer
2927M: Dave Jeffery <ipslinux@adaptec.com> 2950M: Dave Jeffery <ipslinux@adaptec.com>
@@ -4392,13 +4415,12 @@ F: Documentation/filesystems/dlmfs.txt
4392F: fs/ocfs2/ 4415F: fs/ocfs2/
4393 4416
4394ORINOCO DRIVER 4417ORINOCO DRIVER
4395M: Pavel Roskin <proski@gnu.org>
4396M: David Gibson <hermes@gibson.dropbear.id.au>
4397L: linux-wireless@vger.kernel.org 4418L: linux-wireless@vger.kernel.org
4398L: orinoco-users@lists.sourceforge.net 4419L: orinoco-users@lists.sourceforge.net
4399L: orinoco-devel@lists.sourceforge.net 4420L: orinoco-devel@lists.sourceforge.net
4421W: http://linuxwireless.org/en/users/Drivers/orinoco
4400W: http://www.nongnu.org/orinoco/ 4422W: http://www.nongnu.org/orinoco/
4401S: Maintained 4423S: Orphan
4402F: drivers/net/wireless/orinoco/ 4424F: drivers/net/wireless/orinoco/
4403 4425
4404OSD LIBRARY and FILESYSTEM 4426OSD LIBRARY and FILESYSTEM
@@ -4586,6 +4608,14 @@ L: linux-abi-devel@lists.sourceforge.net
4586S: Maintained 4608S: Maintained
4587F: include/linux/personality.h 4609F: include/linux/personality.h
4588 4610
4611PHONET PROTOCOL
4612M: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
4613S: Supported
4614F: Documentation/networking/phonet.txt
4615F: include/linux/phonet.h
4616F: include/net/phonet/
4617F: net/phonet/
4618
4589PHRAM MTD DRIVER 4619PHRAM MTD DRIVER
4590M: Joern Engel <joern@lazybastard.org> 4620M: Joern Engel <joern@lazybastard.org>
4591L: linux-mtd@lists.infradead.org 4621L: linux-mtd@lists.infradead.org
@@ -6489,21 +6519,21 @@ S: Maintained
6489F: drivers/input/misc/wistron_btns.c 6519F: drivers/input/misc/wistron_btns.c
6490 6520
6491WL1251 WIRELESS DRIVER 6521WL1251 WIRELESS DRIVER
6492M: Kalle Valo <kalle.valo@iki.fi> 6522M: Kalle Valo <kvalo@adurom.com>
6493L: linux-wireless@vger.kernel.org 6523L: linux-wireless@vger.kernel.org
6494W: http://wireless.kernel.org 6524W: http://wireless.kernel.org
6495T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git 6525T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
6496S: Maintained 6526S: Maintained
6497F: drivers/net/wireless/wl12xx/* 6527F: drivers/net/wireless/wl1251/*
6498X: drivers/net/wireless/wl12xx/wl1271*
6499 6528
6500WL1271 WIRELESS DRIVER 6529WL1271 WIRELESS DRIVER
6501M: Luciano Coelho <luciano.coelho@nokia.com> 6530M: Luciano Coelho <luciano.coelho@nokia.com>
6502L: linux-wireless@vger.kernel.org 6531L: linux-wireless@vger.kernel.org
6503W: http://wireless.kernel.org 6532W: http://wireless.kernel.org
6504T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git 6533T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
6505S: Maintained 6534S: Maintained
6506F: drivers/net/wireless/wl12xx/wl1271* 6535F: drivers/net/wireless/wl12xx/wl1271*
6536F: include/linux/wl12xx.h
6507 6537
6508WL3501 WIRELESS PCMCIA CARD DRIVER 6538WL3501 WIRELESS PCMCIA CARD DRIVER
6509M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> 6539M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
@@ -6650,6 +6680,20 @@ M: "Maciej W. Rozycki" <macro@linux-mips.org>
6650S: Maintained 6680S: Maintained
6651F: drivers/serial/zs.* 6681F: drivers/serial/zs.*
6652 6682
6683GRE DEMULTIPLEXER DRIVER
6684M: Dmitry Kozlov <xeb@mail.ru>
6685L: netdev@vger.kernel.org
6686S: Maintained
6687F: net/ipv4/gre.c
6688F: include/net/gre.h
6689
6690PPTP DRIVER
6691M: Dmitry Kozlov <xeb@mail.ru>
6692L: netdev@vger.kernel.org
6693S: Maintained
6694F: drivers/net/pptp.c
6695W: http://sourceforge.net/projects/accel-pptp
6696
6653THE REST 6697THE REST
6654M: Linus Torvalds <torvalds@linux-foundation.org> 6698M: Linus Torvalds <torvalds@linux-foundation.org>
6655L: linux-kernel@vger.kernel.org 6699L: linux-kernel@vger.kernel.org