diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-23 14:47:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-23 14:47:02 -0400 |
commit | 5f05647dd81c11a6a165ccc8f0c1370b16f3bcb0 (patch) | |
tree | 7851ef1c93aa1aba7ef327ca4b75fd35e6d10f29 /MAINTAINERS | |
parent | 02f36038c568111ad4fc433f6fa760ff5e38fab4 (diff) | |
parent | ec37a48d1d16c30b655ac5280209edf52a6775d4 (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-- | MAINTAINERS | 62 |
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 | |||
1151 | S: Maintained | 1151 | S: Maintained |
1152 | F: drivers/net/wireless/ath/ar9170/ | 1152 | F: drivers/net/wireless/ath/ar9170/ |
1153 | 1153 | ||
1154 | CARL9170 LINUX COMMUNITY WIRELESS DRIVER | ||
1155 | M: Christian Lamparter <chunkeey@googlemail.com> | ||
1156 | L: linux-wireless@vger.kernel.org | ||
1157 | W: http://wireless.kernel.org/en/users/Drivers/carl9170 | ||
1158 | S: Maintained | ||
1159 | F: drivers/net/wireless/ath/carl9170/ | ||
1160 | |||
1154 | ATK0110 HWMON DRIVER | 1161 | ATK0110 HWMON DRIVER |
1155 | M: Luca Tettamanti <kronos.it@gmail.com> | 1162 | M: Luca Tettamanti <kronos.it@gmail.com> |
1156 | L: lm-sensors@lm-sensors.org | 1163 | L: lm-sensors@lm-sensors.org |
@@ -1375,16 +1382,19 @@ F: drivers/mtd/devices/block2mtd.c | |||
1375 | 1382 | ||
1376 | BLUETOOTH DRIVERS | 1383 | BLUETOOTH DRIVERS |
1377 | M: Marcel Holtmann <marcel@holtmann.org> | 1384 | M: Marcel Holtmann <marcel@holtmann.org> |
1385 | M: Gustavo F. Padovan <padovan@profusion.mobi> | ||
1378 | L: linux-bluetooth@vger.kernel.org | 1386 | L: linux-bluetooth@vger.kernel.org |
1379 | W: http://www.bluez.org/ | 1387 | W: http://www.bluez.org/ |
1388 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git | ||
1380 | S: Maintained | 1389 | S: Maintained |
1381 | F: drivers/bluetooth/ | 1390 | F: drivers/bluetooth/ |
1382 | 1391 | ||
1383 | BLUETOOTH SUBSYSTEM | 1392 | BLUETOOTH SUBSYSTEM |
1384 | M: Marcel Holtmann <marcel@holtmann.org> | 1393 | M: Marcel Holtmann <marcel@holtmann.org> |
1394 | M: Gustavo F. Padovan <padovan@profusion.mobi> | ||
1385 | L: linux-bluetooth@vger.kernel.org | 1395 | L: linux-bluetooth@vger.kernel.org |
1386 | W: http://www.bluez.org/ | 1396 | W: http://www.bluez.org/ |
1387 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git | 1397 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git |
1388 | S: Maintained | 1398 | S: Maintained |
1389 | F: net/bluetooth/ | 1399 | F: net/bluetooth/ |
1390 | F: include/net/bluetooth/ | 1400 | F: include/net/bluetooth/ |
@@ -1429,6 +1439,13 @@ L: linux-scsi@vger.kernel.org | |||
1429 | S: Supported | 1439 | S: Supported |
1430 | F: drivers/scsi/bfa/ | 1440 | F: drivers/scsi/bfa/ |
1431 | 1441 | ||
1442 | BROCADE BNA 10 GIGABIT ETHERNET DRIVER | ||
1443 | M: Rasesh Mody <rmody@brocade.com> | ||
1444 | M: Debashis Dutt <ddutt@brocade.com> | ||
1445 | L: netdev@vger.kernel.org | ||
1446 | S: Supported | ||
1447 | F: drivers/net/bna/ | ||
1448 | |||
1432 | BSG (block layer generic sg v4 driver) | 1449 | BSG (block layer generic sg v4 driver) |
1433 | M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 1450 | M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> |
1434 | L: linux-scsi@vger.kernel.org | 1451 | L: linux-scsi@vger.kernel.org |
@@ -1586,9 +1603,9 @@ S: Supported | |||
1586 | F: scripts/checkpatch.pl | 1603 | F: scripts/checkpatch.pl |
1587 | 1604 | ||
1588 | CISCO VIC ETHERNET NIC DRIVER | 1605 | CISCO VIC ETHERNET NIC DRIVER |
1589 | M: Scott Feldman <scofeldm@cisco.com> | ||
1590 | M: Vasanthy Kolluri <vkolluri@cisco.com> | 1606 | M: Vasanthy Kolluri <vkolluri@cisco.com> |
1591 | M: Roopa Prabhu <roprabhu@cisco.com> | 1607 | M: Roopa Prabhu <roprabhu@cisco.com> |
1608 | M: David Wang <dwang2@cisco.com> | ||
1592 | S: Supported | 1609 | S: Supported |
1593 | F: drivers/net/enic/ | 1610 | F: drivers/net/enic/ |
1594 | 1611 | ||
@@ -2922,6 +2939,12 @@ M: Brian King <brking@us.ibm.com> | |||
2922 | S: Supported | 2939 | S: Supported |
2923 | F: drivers/scsi/ipr.* | 2940 | F: drivers/scsi/ipr.* |
2924 | 2941 | ||
2942 | IBM Power Virtual Ethernet Device Driver | ||
2943 | M: Santiago Leon <santil@linux.vnet.ibm.com> | ||
2944 | L: netdev@vger.kernel.org | ||
2945 | S: Supported | ||
2946 | F: drivers/net/ibmveth.* | ||
2947 | |||
2925 | IBM ServeRAID RAID DRIVER | 2948 | IBM ServeRAID RAID DRIVER |
2926 | P: Jack Hammer | 2949 | P: Jack Hammer |
2927 | M: Dave Jeffery <ipslinux@adaptec.com> | 2950 | M: Dave Jeffery <ipslinux@adaptec.com> |
@@ -4392,13 +4415,12 @@ F: Documentation/filesystems/dlmfs.txt | |||
4392 | F: fs/ocfs2/ | 4415 | F: fs/ocfs2/ |
4393 | 4416 | ||
4394 | ORINOCO DRIVER | 4417 | ORINOCO DRIVER |
4395 | M: Pavel Roskin <proski@gnu.org> | ||
4396 | M: David Gibson <hermes@gibson.dropbear.id.au> | ||
4397 | L: linux-wireless@vger.kernel.org | 4418 | L: linux-wireless@vger.kernel.org |
4398 | L: orinoco-users@lists.sourceforge.net | 4419 | L: orinoco-users@lists.sourceforge.net |
4399 | L: orinoco-devel@lists.sourceforge.net | 4420 | L: orinoco-devel@lists.sourceforge.net |
4421 | W: http://linuxwireless.org/en/users/Drivers/orinoco | ||
4400 | W: http://www.nongnu.org/orinoco/ | 4422 | W: http://www.nongnu.org/orinoco/ |
4401 | S: Maintained | 4423 | S: Orphan |
4402 | F: drivers/net/wireless/orinoco/ | 4424 | F: drivers/net/wireless/orinoco/ |
4403 | 4425 | ||
4404 | OSD LIBRARY and FILESYSTEM | 4426 | OSD LIBRARY and FILESYSTEM |
@@ -4586,6 +4608,14 @@ L: linux-abi-devel@lists.sourceforge.net | |||
4586 | S: Maintained | 4608 | S: Maintained |
4587 | F: include/linux/personality.h | 4609 | F: include/linux/personality.h |
4588 | 4610 | ||
4611 | PHONET PROTOCOL | ||
4612 | M: Remi Denis-Courmont <remi.denis-courmont@nokia.com> | ||
4613 | S: Supported | ||
4614 | F: Documentation/networking/phonet.txt | ||
4615 | F: include/linux/phonet.h | ||
4616 | F: include/net/phonet/ | ||
4617 | F: net/phonet/ | ||
4618 | |||
4589 | PHRAM MTD DRIVER | 4619 | PHRAM MTD DRIVER |
4590 | M: Joern Engel <joern@lazybastard.org> | 4620 | M: Joern Engel <joern@lazybastard.org> |
4591 | L: linux-mtd@lists.infradead.org | 4621 | L: linux-mtd@lists.infradead.org |
@@ -6489,21 +6519,21 @@ S: Maintained | |||
6489 | F: drivers/input/misc/wistron_btns.c | 6519 | F: drivers/input/misc/wistron_btns.c |
6490 | 6520 | ||
6491 | WL1251 WIRELESS DRIVER | 6521 | WL1251 WIRELESS DRIVER |
6492 | M: Kalle Valo <kalle.valo@iki.fi> | 6522 | M: Kalle Valo <kvalo@adurom.com> |
6493 | L: linux-wireless@vger.kernel.org | 6523 | L: linux-wireless@vger.kernel.org |
6494 | W: http://wireless.kernel.org | 6524 | W: http://wireless.kernel.org |
6495 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git | 6525 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git |
6496 | S: Maintained | 6526 | S: Maintained |
6497 | F: drivers/net/wireless/wl12xx/* | 6527 | F: drivers/net/wireless/wl1251/* |
6498 | X: drivers/net/wireless/wl12xx/wl1271* | ||
6499 | 6528 | ||
6500 | WL1271 WIRELESS DRIVER | 6529 | WL1271 WIRELESS DRIVER |
6501 | M: Luciano Coelho <luciano.coelho@nokia.com> | 6530 | M: Luciano Coelho <luciano.coelho@nokia.com> |
6502 | L: linux-wireless@vger.kernel.org | 6531 | L: linux-wireless@vger.kernel.org |
6503 | W: http://wireless.kernel.org | 6532 | W: http://wireless.kernel.org |
6504 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git | 6533 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git |
6505 | S: Maintained | 6534 | S: Maintained |
6506 | F: drivers/net/wireless/wl12xx/wl1271* | 6535 | F: drivers/net/wireless/wl12xx/wl1271* |
6536 | F: include/linux/wl12xx.h | ||
6507 | 6537 | ||
6508 | WL3501 WIRELESS PCMCIA CARD DRIVER | 6538 | WL3501 WIRELESS PCMCIA CARD DRIVER |
6509 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 6539 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> |
@@ -6650,6 +6680,20 @@ M: "Maciej W. Rozycki" <macro@linux-mips.org> | |||
6650 | S: Maintained | 6680 | S: Maintained |
6651 | F: drivers/serial/zs.* | 6681 | F: drivers/serial/zs.* |
6652 | 6682 | ||
6683 | GRE DEMULTIPLEXER DRIVER | ||
6684 | M: Dmitry Kozlov <xeb@mail.ru> | ||
6685 | L: netdev@vger.kernel.org | ||
6686 | S: Maintained | ||
6687 | F: net/ipv4/gre.c | ||
6688 | F: include/net/gre.h | ||
6689 | |||
6690 | PPTP DRIVER | ||
6691 | M: Dmitry Kozlov <xeb@mail.ru> | ||
6692 | L: netdev@vger.kernel.org | ||
6693 | S: Maintained | ||
6694 | F: drivers/net/pptp.c | ||
6695 | W: http://sourceforge.net/projects/accel-pptp | ||
6696 | |||
6653 | THE REST | 6697 | THE REST |
6654 | M: Linus Torvalds <torvalds@linux-foundation.org> | 6698 | M: Linus Torvalds <torvalds@linux-foundation.org> |
6655 | L: linux-kernel@vger.kernel.org | 6699 | L: linux-kernel@vger.kernel.org |