diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 07:25:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 07:25:22 -0400 |
commit | 8a9ea3237e7eb5c25f09e429ad242ae5a3d5ea22 (patch) | |
tree | a0a63398a9983667d52cbbbf4e2405b4f22b1d83 /MAINTAINERS | |
parent | 1be025d3cb40cd295123af2c394f7229ef9b30ca (diff) | |
parent | 8b3408f8ee994973869d8ba32c5bf482bc4ddca4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
dp83640: free packet queues on remove
dp83640: use proper function to free transmit time stamping packets
ipv6: Do not use routes from locally generated RAs
|PATCH net-next] tg3: add tx_dropped counter
be2net: don't create multiple RX/TX rings in multi channel mode
be2net: don't create multiple TXQs in BE2
be2net: refactor VF setup/teardown code into be_vf_setup/clear()
be2net: add vlan/rx-mode/flow-control config to be_setup()
net_sched: cls_flow: use skb_header_pointer()
ipv4: avoid useless call of the function check_peer_pmtu
TCP: remove TCP_DEBUG
net: Fix driver name for mdio-gpio.c
ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
ipv4: fix ipsec forward performance regression
jme: fix irq storm after suspend/resume
route: fix ICMP redirect validation
net: hold sock reference while processing tx timestamps
tcp: md5: add more const attributes
Add ethtool -g support to virtio_net
...
Fix up conflicts in:
- drivers/net/Kconfig:
The split-up generated a trivial conflict with removal of a
stale reference to Documentation/networking/net-modules.txt.
Remove it from the new location instead.
- fs/sysfs/dir.c:
Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
with Eric Biederman's changes for tagged directories.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 218 |
1 files changed, 113 insertions, 105 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 37489ec1da30..f1db840686b1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -117,20 +117,20 @@ Maintainers List (try to look for most precise areas first) | |||
117 | M: Philip Blundell <philb@gnu.org> | 117 | M: Philip Blundell <philb@gnu.org> |
118 | L: netdev@vger.kernel.org | 118 | L: netdev@vger.kernel.org |
119 | S: Maintained | 119 | S: Maintained |
120 | F: drivers/net/3c505* | 120 | F: drivers/net/ethernet/i825xx/3c505* |
121 | 121 | ||
122 | 3C59X NETWORK DRIVER | 122 | 3C59X NETWORK DRIVER |
123 | M: Steffen Klassert <klassert@mathematik.tu-chemnitz.de> | 123 | M: Steffen Klassert <klassert@mathematik.tu-chemnitz.de> |
124 | L: netdev@vger.kernel.org | 124 | L: netdev@vger.kernel.org |
125 | S: Maintained | 125 | S: Maintained |
126 | F: Documentation/networking/vortex.txt | 126 | F: Documentation/networking/vortex.txt |
127 | F: drivers/net/3c59x.c | 127 | F: drivers/net/ethernet/3com/3c59x.c |
128 | 128 | ||
129 | 3CR990 NETWORK DRIVER | 129 | 3CR990 NETWORK DRIVER |
130 | M: David Dillow <dave@thedillows.org> | 130 | M: David Dillow <dave@thedillows.org> |
131 | L: netdev@vger.kernel.org | 131 | L: netdev@vger.kernel.org |
132 | S: Maintained | 132 | S: Maintained |
133 | F: drivers/net/typhoon* | 133 | F: drivers/net/ethernet/3com/typhoon* |
134 | 134 | ||
135 | 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS) | 135 | 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS) |
136 | M: Adam Radford <linuxraid@lsi.com> | 136 | M: Adam Radford <linuxraid@lsi.com> |
@@ -156,7 +156,7 @@ M: Realtek linux nic maintainers <nic_swsd@realtek.com> | |||
156 | M: Francois Romieu <romieu@fr.zoreil.com> | 156 | M: Francois Romieu <romieu@fr.zoreil.com> |
157 | L: netdev@vger.kernel.org | 157 | L: netdev@vger.kernel.org |
158 | S: Maintained | 158 | S: Maintained |
159 | F: drivers/net/r8169.c | 159 | F: drivers/net/ethernet/realtek/r8169.c |
160 | 160 | ||
161 | 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER | 161 | 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER |
162 | M: Greg Kroah-Hartman <gregkh@suse.de> | 162 | M: Greg Kroah-Hartman <gregkh@suse.de> |
@@ -170,8 +170,7 @@ F: include/linux/serial_8250.h | |||
170 | 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.] | 170 | 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.] |
171 | L: netdev@vger.kernel.org | 171 | L: netdev@vger.kernel.org |
172 | S: Orphan / Obsolete | 172 | S: Orphan / Obsolete |
173 | F: drivers/net/*8390* | 173 | F: drivers/net/ethernet/8390/ |
174 | F: drivers/net/ax88796.c | ||
175 | 174 | ||
176 | 9P FILE SYSTEM | 175 | 9P FILE SYSTEM |
177 | M: Eric Van Hensbergen <ericvh@gmail.com> | 176 | M: Eric Van Hensbergen <ericvh@gmail.com> |
@@ -214,7 +213,7 @@ ACENIC DRIVER | |||
214 | M: Jes Sorensen <jes@trained-monkey.org> | 213 | M: Jes Sorensen <jes@trained-monkey.org> |
215 | L: linux-acenic@sunsite.dk | 214 | L: linux-acenic@sunsite.dk |
216 | S: Maintained | 215 | S: Maintained |
217 | F: drivers/net/acenic* | 216 | F: drivers/net/ethernet/alteon/acenic* |
218 | 217 | ||
219 | ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER | 218 | ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER |
220 | M: Peter Feuerer <peter@piie.net> | 219 | M: Peter Feuerer <peter@piie.net> |
@@ -746,7 +745,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | |||
746 | W: http://www.arm.linux.org.uk/ | 745 | W: http://www.arm.linux.org.uk/ |
747 | S: Maintained | 746 | S: Maintained |
748 | F: arch/arm/mach-ebsa110/ | 747 | F: arch/arm/mach-ebsa110/ |
749 | F: drivers/net/arm/am79c961a.* | 748 | F: drivers/net/ethernet/amd/am79c961a.* |
750 | 749 | ||
751 | ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6) | 750 | ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6) |
752 | M: Daniel Ribeiro <drwyrm@gmail.com> | 751 | M: Daniel Ribeiro <drwyrm@gmail.com> |
@@ -1015,7 +1014,8 @@ F: arch/arm/include/asm/hardware/ioc.h | |||
1015 | F: arch/arm/include/asm/hardware/iomd.h | 1014 | F: arch/arm/include/asm/hardware/iomd.h |
1016 | F: arch/arm/include/asm/hardware/memc.h | 1015 | F: arch/arm/include/asm/hardware/memc.h |
1017 | F: arch/arm/mach-rpc/ | 1016 | F: arch/arm/mach-rpc/ |
1018 | F: drivers/net/arm/ether* | 1017 | F: drivers/net/ethernet/i825xx/ether1* |
1018 | F: drivers/net/ethernet/seeq/ether3* | ||
1019 | F: drivers/scsi/arm/ | 1019 | F: drivers/scsi/arm/ |
1020 | 1020 | ||
1021 | ARM/SHARK MACHINE SUPPORT | 1021 | ARM/SHARK MACHINE SUPPORT |
@@ -1127,7 +1127,7 @@ F: arch/arm/mach-nuc93x/ | |||
1127 | F: drivers/input/keyboard/w90p910_keypad.c | 1127 | F: drivers/input/keyboard/w90p910_keypad.c |
1128 | F: drivers/input/touchscreen/w90p910_ts.c | 1128 | F: drivers/input/touchscreen/w90p910_ts.c |
1129 | F: drivers/watchdog/nuc900_wdt.c | 1129 | F: drivers/watchdog/nuc900_wdt.c |
1130 | F: drivers/net/arm/w90p910_ether.c | 1130 | F: drivers/net/ethernet/nuvoton/w90p910_ether.c |
1131 | F: drivers/mtd/nand/nuc900_nand.c | 1131 | F: drivers/mtd/nand/nuc900_nand.c |
1132 | F: drivers/rtc/rtc-nuc900.c | 1132 | F: drivers/rtc/rtc-nuc900.c |
1133 | F: drivers/spi/spi_nuc900.c | 1133 | F: drivers/spi/spi_nuc900.c |
@@ -1230,7 +1230,7 @@ F: Documentation/aoe/ | |||
1230 | F: drivers/block/aoe/ | 1230 | F: drivers/block/aoe/ |
1231 | 1231 | ||
1232 | ATHEROS ATH GENERIC UTILITIES | 1232 | ATHEROS ATH GENERIC UTILITIES |
1233 | M: "Luis R. Rodriguez" <lrodriguez@atheros.com> | 1233 | M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> |
1234 | L: linux-wireless@vger.kernel.org | 1234 | L: linux-wireless@vger.kernel.org |
1235 | S: Supported | 1235 | S: Supported |
1236 | F: drivers/net/wireless/ath/* | 1236 | F: drivers/net/wireless/ath/* |
@@ -1238,7 +1238,7 @@ F: drivers/net/wireless/ath/* | |||
1238 | ATHEROS ATH5K WIRELESS DRIVER | 1238 | ATHEROS ATH5K WIRELESS DRIVER |
1239 | M: Jiri Slaby <jirislaby@gmail.com> | 1239 | M: Jiri Slaby <jirislaby@gmail.com> |
1240 | M: Nick Kossifidis <mickflemm@gmail.com> | 1240 | M: Nick Kossifidis <mickflemm@gmail.com> |
1241 | M: "Luis R. Rodriguez" <lrodriguez@atheros.com> | 1241 | M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> |
1242 | M: Bob Copeland <me@bobcopeland.com> | 1242 | M: Bob Copeland <me@bobcopeland.com> |
1243 | L: linux-wireless@vger.kernel.org | 1243 | L: linux-wireless@vger.kernel.org |
1244 | L: ath5k-devel@lists.ath5k.org | 1244 | L: ath5k-devel@lists.ath5k.org |
@@ -1246,11 +1246,19 @@ W: http://wireless.kernel.org/en/users/Drivers/ath5k | |||
1246 | S: Maintained | 1246 | S: Maintained |
1247 | F: drivers/net/wireless/ath/ath5k/ | 1247 | F: drivers/net/wireless/ath/ath5k/ |
1248 | 1248 | ||
1249 | ATHEROS ATH6KL WIRELESS DRIVER | ||
1250 | M: Kalle Valo <kvalo@qca.qualcomm.com> | ||
1251 | L: linux-wireless@vger.kernel.org | ||
1252 | W: http://wireless.kernel.org/en/users/Drivers/ath6kl | ||
1253 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git | ||
1254 | S: Supported | ||
1255 | F: drivers/net/wireless/ath/ath6kl/ | ||
1256 | |||
1249 | ATHEROS ATH9K WIRELESS DRIVER | 1257 | ATHEROS ATH9K WIRELESS DRIVER |
1250 | M: "Luis R. Rodriguez" <lrodriguez@atheros.com> | 1258 | M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> |
1251 | M: Jouni Malinen <jmalinen@atheros.com> | 1259 | M: Jouni Malinen <jouni@qca.qualcomm.com> |
1252 | M: Vasanthakumar Thiagarajan <vasanth@atheros.com> | 1260 | M: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> |
1253 | M: Senthil Balasubramanian <senthilkumar@atheros.com> | 1261 | M: Senthil Balasubramanian <senthilb@qca.qualcomm.com> |
1254 | L: linux-wireless@vger.kernel.org | 1262 | L: linux-wireless@vger.kernel.org |
1255 | L: ath9k-devel@lists.ath9k.org | 1263 | L: ath9k-devel@lists.ath9k.org |
1256 | W: http://wireless.kernel.org/en/users/Drivers/ath9k | 1264 | W: http://wireless.kernel.org/en/users/Drivers/ath9k |
@@ -1282,7 +1290,7 @@ L: netdev@vger.kernel.org | |||
1282 | W: http://sourceforge.net/projects/atl1 | 1290 | W: http://sourceforge.net/projects/atl1 |
1283 | W: http://atl1.sourceforge.net | 1291 | W: http://atl1.sourceforge.net |
1284 | S: Maintained | 1292 | S: Maintained |
1285 | F: drivers/net/atlx/ | 1293 | F: drivers/net/ethernet/atheros/ |
1286 | 1294 | ||
1287 | ATM | 1295 | ATM |
1288 | M: Chas Williams <chas@cmf.nrl.navy.mil> | 1296 | M: Chas Williams <chas@cmf.nrl.navy.mil> |
@@ -1322,7 +1330,7 @@ F: include/video/atmel_lcdc.h | |||
1322 | ATMEL MACB ETHERNET DRIVER | 1330 | ATMEL MACB ETHERNET DRIVER |
1323 | M: Nicolas Ferre <nicolas.ferre@atmel.com> | 1331 | M: Nicolas Ferre <nicolas.ferre@atmel.com> |
1324 | S: Supported | 1332 | S: Supported |
1325 | F: drivers/net/macb.* | 1333 | F: drivers/net/ethernet/cadence/ |
1326 | 1334 | ||
1327 | ATMEL SPI DRIVER | 1335 | ATMEL SPI DRIVER |
1328 | M: Nicolas Ferre <nicolas.ferre@atmel.com> | 1336 | M: Nicolas Ferre <nicolas.ferre@atmel.com> |
@@ -1445,7 +1453,7 @@ BLACKFIN EMAC DRIVER | |||
1445 | L: uclinux-dist-devel@blackfin.uclinux.org | 1453 | L: uclinux-dist-devel@blackfin.uclinux.org |
1446 | W: http://blackfin.uclinux.org | 1454 | W: http://blackfin.uclinux.org |
1447 | S: Supported | 1455 | S: Supported |
1448 | F: drivers/net/bfin_mac.* | 1456 | F: drivers/net/ethernet/adi/ |
1449 | 1457 | ||
1450 | BLACKFIN RTC DRIVER | 1458 | BLACKFIN RTC DRIVER |
1451 | M: Mike Frysinger <vapier.adi@gmail.com> | 1459 | M: Mike Frysinger <vapier.adi@gmail.com> |
@@ -1526,27 +1534,27 @@ BROADCOM B44 10/100 ETHERNET DRIVER | |||
1526 | M: Gary Zambrano <zambrano@broadcom.com> | 1534 | M: Gary Zambrano <zambrano@broadcom.com> |
1527 | L: netdev@vger.kernel.org | 1535 | L: netdev@vger.kernel.org |
1528 | S: Supported | 1536 | S: Supported |
1529 | F: drivers/net/b44.* | 1537 | F: drivers/net/ethernet/broadcom/b44.* |
1530 | 1538 | ||
1531 | BROADCOM BNX2 GIGABIT ETHERNET DRIVER | 1539 | BROADCOM BNX2 GIGABIT ETHERNET DRIVER |
1532 | M: Michael Chan <mchan@broadcom.com> | 1540 | M: Michael Chan <mchan@broadcom.com> |
1533 | L: netdev@vger.kernel.org | 1541 | L: netdev@vger.kernel.org |
1534 | S: Supported | 1542 | S: Supported |
1535 | F: drivers/net/bnx2.* | 1543 | F: drivers/net/ethernet/broadcom/bnx2.* |
1536 | F: drivers/net/bnx2_* | 1544 | F: drivers/net/ethernet/broadcom/bnx2_* |
1537 | 1545 | ||
1538 | BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER | 1546 | BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER |
1539 | M: Eilon Greenstein <eilong@broadcom.com> | 1547 | M: Eilon Greenstein <eilong@broadcom.com> |
1540 | L: netdev@vger.kernel.org | 1548 | L: netdev@vger.kernel.org |
1541 | S: Supported | 1549 | S: Supported |
1542 | F: drivers/net/bnx2x/ | 1550 | F: drivers/net/ethernet/broadcom/bnx2x/ |
1543 | 1551 | ||
1544 | BROADCOM TG3 GIGABIT ETHERNET DRIVER | 1552 | BROADCOM TG3 GIGABIT ETHERNET DRIVER |
1545 | M: Matt Carlson <mcarlson@broadcom.com> | 1553 | M: Matt Carlson <mcarlson@broadcom.com> |
1546 | M: Michael Chan <mchan@broadcom.com> | 1554 | M: Michael Chan <mchan@broadcom.com> |
1547 | L: netdev@vger.kernel.org | 1555 | L: netdev@vger.kernel.org |
1548 | S: Supported | 1556 | S: Supported |
1549 | F: drivers/net/tg3.* | 1557 | F: drivers/net/ethernet/broadcom/tg3.* |
1550 | 1558 | ||
1551 | BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER | 1559 | BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER |
1552 | M: Brett Rudley <brudley@broadcom.com> | 1560 | M: Brett Rudley <brudley@broadcom.com> |
@@ -1575,7 +1583,7 @@ BROCADE BNA 10 GIGABIT ETHERNET DRIVER | |||
1575 | M: Rasesh Mody <rmody@brocade.com> | 1583 | M: Rasesh Mody <rmody@brocade.com> |
1576 | L: netdev@vger.kernel.org | 1584 | L: netdev@vger.kernel.org |
1577 | S: Supported | 1585 | S: Supported |
1578 | F: drivers/net/bna/ | 1586 | F: drivers/net/ethernet/brocade/bna/ |
1579 | 1587 | ||
1580 | BSG (block layer generic sg v4 driver) | 1588 | BSG (block layer generic sg v4 driver) |
1581 | M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 1589 | M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> |
@@ -1663,7 +1671,7 @@ CAN NETWORK LAYER | |||
1663 | M: Oliver Hartkopp <socketcan@hartkopp.net> | 1671 | M: Oliver Hartkopp <socketcan@hartkopp.net> |
1664 | M: Oliver Hartkopp <oliver.hartkopp@volkswagen.de> | 1672 | M: Oliver Hartkopp <oliver.hartkopp@volkswagen.de> |
1665 | M: Urs Thuermann <urs.thuermann@volkswagen.de> | 1673 | M: Urs Thuermann <urs.thuermann@volkswagen.de> |
1666 | L: socketcan-core@lists.berlios.de (subscribers-only) | 1674 | L: linux-can@vger.kernel.org |
1667 | L: netdev@vger.kernel.org | 1675 | L: netdev@vger.kernel.org |
1668 | W: http://developer.berlios.de/projects/socketcan/ | 1676 | W: http://developer.berlios.de/projects/socketcan/ |
1669 | S: Maintained | 1677 | S: Maintained |
@@ -1675,7 +1683,7 @@ F: include/linux/can/raw.h | |||
1675 | 1683 | ||
1676 | CAN NETWORK DRIVERS | 1684 | CAN NETWORK DRIVERS |
1677 | M: Wolfgang Grandegger <wg@grandegger.com> | 1685 | M: Wolfgang Grandegger <wg@grandegger.com> |
1678 | L: socketcan-core@lists.berlios.de (subscribers-only) | 1686 | L: linux-can@vger.kernel.org |
1679 | L: netdev@vger.kernel.org | 1687 | L: netdev@vger.kernel.org |
1680 | W: http://developer.berlios.de/projects/socketcan/ | 1688 | W: http://developer.berlios.de/projects/socketcan/ |
1681 | S: Maintained | 1689 | S: Maintained |
@@ -1759,13 +1767,13 @@ M: Christian Benvenuti <benve@cisco.com> | |||
1759 | M: Roopa Prabhu <roprabhu@cisco.com> | 1767 | M: Roopa Prabhu <roprabhu@cisco.com> |
1760 | M: David Wang <dwang2@cisco.com> | 1768 | M: David Wang <dwang2@cisco.com> |
1761 | S: Supported | 1769 | S: Supported |
1762 | F: drivers/net/enic/ | 1770 | F: drivers/net/ethernet/cisco/enic/ |
1763 | 1771 | ||
1764 | CIRRUS LOGIC EP93XX ETHERNET DRIVER | 1772 | CIRRUS LOGIC EP93XX ETHERNET DRIVER |
1765 | M: Hartley Sweeten <hsweeten@visionengravers.com> | 1773 | M: Hartley Sweeten <hsweeten@visionengravers.com> |
1766 | L: netdev@vger.kernel.org | 1774 | L: netdev@vger.kernel.org |
1767 | S: Maintained | 1775 | S: Maintained |
1768 | F: drivers/net/arm/ep93xx_eth.c | 1776 | F: drivers/net/ethernet/cirrus/ep93xx_eth.c |
1769 | 1777 | ||
1770 | CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER | 1778 | CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER |
1771 | M: Lennert Buytenhek <kernel@wantstofly.org> | 1779 | M: Lennert Buytenhek <kernel@wantstofly.org> |
@@ -1905,7 +1913,7 @@ CPMAC ETHERNET DRIVER | |||
1905 | M: Florian Fainelli <florian@openwrt.org> | 1913 | M: Florian Fainelli <florian@openwrt.org> |
1906 | L: netdev@vger.kernel.org | 1914 | L: netdev@vger.kernel.org |
1907 | S: Maintained | 1915 | S: Maintained |
1908 | F: drivers/net/cpmac.c | 1916 | F: drivers/net/ethernet/ti/cpmac.c |
1909 | 1917 | ||
1910 | CPU FREQUENCY DRIVERS | 1918 | CPU FREQUENCY DRIVERS |
1911 | M: Dave Jones <davej@redhat.com> | 1919 | M: Dave Jones <davej@redhat.com> |
@@ -1992,7 +2000,7 @@ M: Divy Le Ray <divy@chelsio.com> | |||
1992 | L: netdev@vger.kernel.org | 2000 | L: netdev@vger.kernel.org |
1993 | W: http://www.chelsio.com | 2001 | W: http://www.chelsio.com |
1994 | S: Supported | 2002 | S: Supported |
1995 | F: drivers/net/cxgb3/ | 2003 | F: drivers/net/ethernet/chelsio/cxgb3/ |
1996 | 2004 | ||
1997 | CXGB3 IWARP RNIC DRIVER (IW_CXGB3) | 2005 | CXGB3 IWARP RNIC DRIVER (IW_CXGB3) |
1998 | M: Steve Wise <swise@chelsio.com> | 2006 | M: Steve Wise <swise@chelsio.com> |
@@ -2006,7 +2014,7 @@ M: Dimitris Michailidis <dm@chelsio.com> | |||
2006 | L: netdev@vger.kernel.org | 2014 | L: netdev@vger.kernel.org |
2007 | W: http://www.chelsio.com | 2015 | W: http://www.chelsio.com |
2008 | S: Supported | 2016 | S: Supported |
2009 | F: drivers/net/cxgb4/ | 2017 | F: drivers/net/ethernet/chelsio/cxgb4/ |
2010 | 2018 | ||
2011 | CXGB4 IWARP RNIC DRIVER (IW_CXGB4) | 2019 | CXGB4 IWARP RNIC DRIVER (IW_CXGB4) |
2012 | M: Steve Wise <swise@chelsio.com> | 2020 | M: Steve Wise <swise@chelsio.com> |
@@ -2020,14 +2028,14 @@ M: Casey Leedom <leedom@chelsio.com> | |||
2020 | L: netdev@vger.kernel.org | 2028 | L: netdev@vger.kernel.org |
2021 | W: http://www.chelsio.com | 2029 | W: http://www.chelsio.com |
2022 | S: Supported | 2030 | S: Supported |
2023 | F: drivers/net/cxgb4vf/ | 2031 | F: drivers/net/ethernet/chelsio/cxgb4vf/ |
2024 | 2032 | ||
2025 | STMMAC ETHERNET DRIVER | 2033 | STMMAC ETHERNET DRIVER |
2026 | M: Giuseppe Cavallaro <peppe.cavallaro@st.com> | 2034 | M: Giuseppe Cavallaro <peppe.cavallaro@st.com> |
2027 | L: netdev@vger.kernel.org | 2035 | L: netdev@vger.kernel.org |
2028 | W: http://www.stlinux.com | 2036 | W: http://www.stlinux.com |
2029 | S: Supported | 2037 | S: Supported |
2030 | F: drivers/net/stmmac/ | 2038 | F: drivers/net/ethernet/stmicro/stmmac/ |
2031 | 2039 | ||
2032 | CYBERPRO FB DRIVER | 2040 | CYBERPRO FB DRIVER |
2033 | M: Russell King <linux@arm.linux.org.uk> | 2041 | M: Russell King <linux@arm.linux.org.uk> |
@@ -2071,7 +2079,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER | |||
2071 | L: netdev@vger.kernel.org | 2079 | L: netdev@vger.kernel.org |
2072 | S: Orphan | 2080 | S: Orphan |
2073 | F: Documentation/networking/dmfe.txt | 2081 | F: Documentation/networking/dmfe.txt |
2074 | F: drivers/net/tulip/dmfe.c | 2082 | F: drivers/net/ethernet/tulip/dmfe.c |
2075 | 2083 | ||
2076 | DC390/AM53C974 SCSI driver | 2084 | DC390/AM53C974 SCSI driver |
2077 | M: Kurt Garloff <garloff@suse.de> | 2085 | M: Kurt Garloff <garloff@suse.de> |
@@ -2110,7 +2118,7 @@ F: net/decnet/ | |||
2110 | DEFXX FDDI NETWORK DRIVER | 2118 | DEFXX FDDI NETWORK DRIVER |
2111 | M: "Maciej W. Rozycki" <macro@linux-mips.org> | 2119 | M: "Maciej W. Rozycki" <macro@linux-mips.org> |
2112 | S: Maintained | 2120 | S: Maintained |
2113 | F: drivers/net/defxx.* | 2121 | F: drivers/net/fddi/defxx.* |
2114 | 2122 | ||
2115 | DELL LAPTOP DRIVER | 2123 | DELL LAPTOP DRIVER |
2116 | M: Matthew Garrett <mjg59@srcf.ucam.org> | 2124 | M: Matthew Garrett <mjg59@srcf.ucam.org> |
@@ -2477,7 +2485,7 @@ EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER | |||
2477 | M: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> | 2485 | M: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> |
2478 | L: netdev@vger.kernel.org | 2486 | L: netdev@vger.kernel.org |
2479 | S: Maintained | 2487 | S: Maintained |
2480 | F: drivers/net/ehea/ | 2488 | F: drivers/net/ethernet/ibm/ehea/ |
2481 | 2489 | ||
2482 | EMBEDDED LINUX | 2490 | EMBEDDED LINUX |
2483 | M: Paul Gortmaker <paul.gortmaker@windriver.com> | 2491 | M: Paul Gortmaker <paul.gortmaker@windriver.com> |
@@ -2522,7 +2530,7 @@ ETHEREXPRESS-16 NETWORK DRIVER | |||
2522 | M: Philip Blundell <philb@gnu.org> | 2530 | M: Philip Blundell <philb@gnu.org> |
2523 | L: netdev@vger.kernel.org | 2531 | L: netdev@vger.kernel.org |
2524 | S: Maintained | 2532 | S: Maintained |
2525 | F: drivers/net/eexpress.* | 2533 | F: drivers/net/ethernet/i825xx/eexpress.* |
2526 | 2534 | ||
2527 | ETHERNET BRIDGE | 2535 | ETHERNET BRIDGE |
2528 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 2536 | M: Stephen Hemminger <shemminger@linux-foundation.org> |
@@ -2536,7 +2544,7 @@ F: net/bridge/ | |||
2536 | ETHERTEAM 16I DRIVER | 2544 | ETHERTEAM 16I DRIVER |
2537 | M: Mika Kuoppala <miku@iki.fi> | 2545 | M: Mika Kuoppala <miku@iki.fi> |
2538 | S: Maintained | 2546 | S: Maintained |
2539 | F: drivers/net/eth16i.c | 2547 | F: drivers/net/ethernet/fujitsu/eth16i.c |
2540 | 2548 | ||
2541 | EXT2 FILE SYSTEM | 2549 | EXT2 FILE SYSTEM |
2542 | M: Jan Kara <jack@suse.cz> | 2550 | M: Jan Kara <jack@suse.cz> |
@@ -2705,7 +2713,7 @@ M: Vitaly Bordug <vbordug@ru.mvista.com> | |||
2705 | L: linuxppc-dev@lists.ozlabs.org | 2713 | L: linuxppc-dev@lists.ozlabs.org |
2706 | L: netdev@vger.kernel.org | 2714 | L: netdev@vger.kernel.org |
2707 | S: Maintained | 2715 | S: Maintained |
2708 | F: drivers/net/fs_enet/ | 2716 | F: drivers/net/ethernet/freescale/fs_enet/ |
2709 | F: include/linux/fs_enet_pd.h | 2717 | F: include/linux/fs_enet_pd.h |
2710 | 2718 | ||
2711 | FREESCALE QUICC ENGINE LIBRARY | 2719 | FREESCALE QUICC ENGINE LIBRARY |
@@ -2727,7 +2735,7 @@ M: Li Yang <leoli@freescale.com> | |||
2727 | L: netdev@vger.kernel.org | 2735 | L: netdev@vger.kernel.org |
2728 | L: linuxppc-dev@lists.ozlabs.org | 2736 | L: linuxppc-dev@lists.ozlabs.org |
2729 | S: Maintained | 2737 | S: Maintained |
2730 | F: drivers/net/ucc_geth* | 2738 | F: drivers/net/ethernet/freescale/ucc_geth* |
2731 | 2739 | ||
2732 | FREESCALE QUICC ENGINE UCC UART DRIVER | 2740 | FREESCALE QUICC ENGINE UCC UART DRIVER |
2733 | M: Timur Tabi <timur@freescale.com> | 2741 | M: Timur Tabi <timur@freescale.com> |
@@ -3065,6 +3073,7 @@ S: Maintained | |||
3065 | F: include/linux/hippidevice.h | 3073 | F: include/linux/hippidevice.h |
3066 | F: include/linux/if_hippi.h | 3074 | F: include/linux/if_hippi.h |
3067 | F: net/802/hippi.c | 3075 | F: net/802/hippi.c |
3076 | F: drivers/net/hippi/ | ||
3068 | 3077 | ||
3069 | HOST AP DRIVER | 3078 | HOST AP DRIVER |
3070 | M: Jouni Malinen <j@w1.fi> | 3079 | M: Jouni Malinen <j@w1.fi> |
@@ -3082,7 +3091,7 @@ F: drivers/platform/x86/tc1100-wmi.c | |||
3082 | HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series | 3091 | HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series |
3083 | M: Jaroslav Kysela <perex@perex.cz> | 3092 | M: Jaroslav Kysela <perex@perex.cz> |
3084 | S: Maintained | 3093 | S: Maintained |
3085 | F: drivers/net/hp100.* | 3094 | F: drivers/net/ethernet/hp/hp100.* |
3086 | 3095 | ||
3087 | HPET: High Precision Event Timers driver | 3096 | HPET: High Precision Event Timers driver |
3088 | M: Clemens Ladisch <clemens@ladisch.de> | 3097 | M: Clemens Ladisch <clemens@ladisch.de> |
@@ -3180,7 +3189,7 @@ IBM Power Virtual Ethernet Device Driver | |||
3180 | M: Santiago Leon <santil@linux.vnet.ibm.com> | 3189 | M: Santiago Leon <santil@linux.vnet.ibm.com> |
3181 | L: netdev@vger.kernel.org | 3190 | L: netdev@vger.kernel.org |
3182 | S: Supported | 3191 | S: Supported |
3183 | F: drivers/net/ibmveth.* | 3192 | F: drivers/net/ethernet/ibm/ibmveth.* |
3184 | 3193 | ||
3185 | IBM ServeRAID RAID DRIVER | 3194 | IBM ServeRAID RAID DRIVER |
3186 | P: Jack Hammer | 3195 | P: Jack Hammer |
@@ -3347,7 +3356,7 @@ F: arch/arm/mach-ixp4xx/include/mach/qmgr.h | |||
3347 | F: arch/arm/mach-ixp4xx/include/mach/npe.h | 3356 | F: arch/arm/mach-ixp4xx/include/mach/npe.h |
3348 | F: arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 3357 | F: arch/arm/mach-ixp4xx/ixp4xx_qmgr.c |
3349 | F: arch/arm/mach-ixp4xx/ixp4xx_npe.c | 3358 | F: arch/arm/mach-ixp4xx/ixp4xx_npe.c |
3350 | F: drivers/net/arm/ixp4xx_eth.c | 3359 | F: drivers/net/ethernet/xscale/ixp4xx_eth.c |
3351 | F: drivers/net/wan/ixp4xx_hss.c | 3360 | F: drivers/net/wan/ixp4xx_hss.c |
3352 | 3361 | ||
3353 | INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT | 3362 | INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT |
@@ -3359,7 +3368,7 @@ INTEL IXP2000 ETHERNET DRIVER | |||
3359 | M: Lennert Buytenhek <kernel@wantstofly.org> | 3368 | M: Lennert Buytenhek <kernel@wantstofly.org> |
3360 | L: netdev@vger.kernel.org | 3369 | L: netdev@vger.kernel.org |
3361 | S: Maintained | 3370 | S: Maintained |
3362 | F: drivers/net/ixp2000/ | 3371 | F: drivers/net/ethernet/xscale/ixp2000/ |
3363 | 3372 | ||
3364 | INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf) | 3373 | INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf) |
3365 | M: Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 3374 | M: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
@@ -3368,13 +3377,13 @@ M: Bruce Allan <bruce.w.allan@intel.com> | |||
3368 | M: Carolyn Wyborny <carolyn.wyborny@intel.com> | 3377 | M: Carolyn Wyborny <carolyn.wyborny@intel.com> |
3369 | M: Don Skidmore <donald.c.skidmore@intel.com> | 3378 | M: Don Skidmore <donald.c.skidmore@intel.com> |
3370 | M: Greg Rose <gregory.v.rose@intel.com> | 3379 | M: Greg Rose <gregory.v.rose@intel.com> |
3371 | M: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com> | 3380 | M: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> |
3372 | M: Alex Duyck <alexander.h.duyck@intel.com> | 3381 | M: Alex Duyck <alexander.h.duyck@intel.com> |
3373 | M: John Ronciak <john.ronciak@intel.com> | 3382 | M: John Ronciak <john.ronciak@intel.com> |
3374 | L: e1000-devel@lists.sourceforge.net | 3383 | L: e1000-devel@lists.sourceforge.net |
3375 | W: http://e1000.sourceforge.net/ | 3384 | W: http://e1000.sourceforge.net/ |
3376 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git | 3385 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git |
3377 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git | 3386 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git |
3378 | S: Supported | 3387 | S: Supported |
3379 | F: Documentation/networking/e100.txt | 3388 | F: Documentation/networking/e100.txt |
3380 | F: Documentation/networking/e1000.txt | 3389 | F: Documentation/networking/e1000.txt |
@@ -3384,14 +3393,7 @@ F: Documentation/networking/igbvf.txt | |||
3384 | F: Documentation/networking/ixgb.txt | 3393 | F: Documentation/networking/ixgb.txt |
3385 | F: Documentation/networking/ixgbe.txt | 3394 | F: Documentation/networking/ixgbe.txt |
3386 | F: Documentation/networking/ixgbevf.txt | 3395 | F: Documentation/networking/ixgbevf.txt |
3387 | F: drivers/net/e100.c | 3396 | F: drivers/net/ethernet/intel/ |
3388 | F: drivers/net/e1000/ | ||
3389 | F: drivers/net/e1000e/ | ||
3390 | F: drivers/net/igb/ | ||
3391 | F: drivers/net/igbvf/ | ||
3392 | F: drivers/net/ixgb/ | ||
3393 | F: drivers/net/ixgbe/ | ||
3394 | F: drivers/net/ixgbevf/ | ||
3395 | 3397 | ||
3396 | INTEL MRST PMU DRIVER | 3398 | INTEL MRST PMU DRIVER |
3397 | M: Len Brown <len.brown@intel.com> | 3399 | M: Len Brown <len.brown@intel.com> |
@@ -3443,7 +3445,7 @@ M: Wey-Yi Guy <wey-yi.w.guy@intel.com> | |||
3443 | M: Intel Linux Wireless <ilw@linux.intel.com> | 3445 | M: Intel Linux Wireless <ilw@linux.intel.com> |
3444 | L: linux-wireless@vger.kernel.org | 3446 | L: linux-wireless@vger.kernel.org |
3445 | W: http://intellinuxwireless.org | 3447 | W: http://intellinuxwireless.org |
3446 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git | 3448 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git |
3447 | S: Supported | 3449 | S: Supported |
3448 | F: drivers/net/wireless/iwlwifi/ | 3450 | F: drivers/net/wireless/iwlwifi/ |
3449 | 3451 | ||
@@ -3459,7 +3461,7 @@ IOC3 ETHERNET DRIVER | |||
3459 | M: Ralf Baechle <ralf@linux-mips.org> | 3461 | M: Ralf Baechle <ralf@linux-mips.org> |
3460 | L: linux-mips@linux-mips.org | 3462 | L: linux-mips@linux-mips.org |
3461 | S: Maintained | 3463 | S: Maintained |
3462 | F: drivers/net/ioc3-eth.c | 3464 | F: drivers/net/ethernet/sgi/ioc3-eth.c |
3463 | 3465 | ||
3464 | IOC3 SERIAL DRIVER | 3466 | IOC3 SERIAL DRIVER |
3465 | M: Pat Gefre <pfg@sgi.com> | 3467 | M: Pat Gefre <pfg@sgi.com> |
@@ -3477,7 +3479,7 @@ M: Francois Romieu <romieu@fr.zoreil.com> | |||
3477 | M: Sorbica Shieh <sorbica@icplus.com.tw> | 3479 | M: Sorbica Shieh <sorbica@icplus.com.tw> |
3478 | L: netdev@vger.kernel.org | 3480 | L: netdev@vger.kernel.org |
3479 | S: Maintained | 3481 | S: Maintained |
3480 | F: drivers/net/ipg.* | 3482 | F: drivers/net/ethernet/icplus/ipg.* |
3481 | 3483 | ||
3482 | IPATH DRIVER | 3484 | IPATH DRIVER |
3483 | M: Mike Marciniszyn <infinipath@qlogic.com> | 3485 | M: Mike Marciniszyn <infinipath@qlogic.com> |
@@ -3625,7 +3627,7 @@ JME NETWORK DRIVER | |||
3625 | M: Guo-Fu Tseng <cooldavid@cooldavid.org> | 3627 | M: Guo-Fu Tseng <cooldavid@cooldavid.org> |
3626 | L: netdev@vger.kernel.org | 3628 | L: netdev@vger.kernel.org |
3627 | S: Maintained | 3629 | S: Maintained |
3628 | F: drivers/net/jme.* | 3630 | F: drivers/net/ethernet/jme.* |
3629 | 3631 | ||
3630 | JOURNALLING FLASH FILE SYSTEM V2 (JFFS2) | 3632 | JOURNALLING FLASH FILE SYSTEM V2 (JFFS2) |
3631 | M: David Woodhouse <dwmw2@infradead.org> | 3633 | M: David Woodhouse <dwmw2@infradead.org> |
@@ -4156,7 +4158,7 @@ MARVELL MV643XX ETHERNET DRIVER | |||
4156 | M: Lennert Buytenhek <buytenh@wantstofly.org> | 4158 | M: Lennert Buytenhek <buytenh@wantstofly.org> |
4157 | L: netdev@vger.kernel.org | 4159 | L: netdev@vger.kernel.org |
4158 | S: Maintained | 4160 | S: Maintained |
4159 | F: drivers/net/mv643xx_eth.* | 4161 | F: drivers/net/ethernet/marvell/mv643xx_eth.* |
4160 | F: include/linux/mv643xx.h | 4162 | F: include/linux/mv643xx.h |
4161 | 4163 | ||
4162 | MARVELL MWIFIEX WIRELESS DRIVER | 4164 | MARVELL MWIFIEX WIRELESS DRIVER |
@@ -4370,12 +4372,12 @@ M: Andrew Gallatin <gallatin@myri.com> | |||
4370 | L: netdev@vger.kernel.org | 4372 | L: netdev@vger.kernel.org |
4371 | W: http://www.myri.com/scs/download-Myri10GE.html | 4373 | W: http://www.myri.com/scs/download-Myri10GE.html |
4372 | S: Supported | 4374 | S: Supported |
4373 | F: drivers/net/myri10ge/ | 4375 | F: drivers/net/ethernet/myricom/myri10ge/ |
4374 | 4376 | ||
4375 | NATSEMI ETHERNET DRIVER (DP8381x) | 4377 | NATSEMI ETHERNET DRIVER (DP8381x) |
4376 | M: Tim Hockin <thockin@hockin.org> | 4378 | M: Tim Hockin <thockin@hockin.org> |
4377 | S: Maintained | 4379 | S: Maintained |
4378 | F: drivers/net/natsemi.c | 4380 | F: drivers/net/ethernet/natsemi/natsemi.c |
4379 | 4381 | ||
4380 | NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER | 4382 | NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER |
4381 | M: Daniel Mack <zonque@gmail.com> | 4383 | M: Daniel Mack <zonque@gmail.com> |
@@ -4415,9 +4417,8 @@ W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous | |||
4415 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous | 4417 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous |
4416 | S: Supported | 4418 | S: Supported |
4417 | F: Documentation/networking/s2io.txt | 4419 | F: Documentation/networking/s2io.txt |
4418 | F: drivers/net/s2io* | ||
4419 | F: Documentation/networking/vxge.txt | 4420 | F: Documentation/networking/vxge.txt |
4420 | F: drivers/net/vxge/ | 4421 | F: drivers/net/ethernet/neterion/ |
4421 | 4422 | ||
4422 | NETFILTER/IPTABLES/IPCHAINS | 4423 | NETFILTER/IPTABLES/IPCHAINS |
4423 | P: Rusty Russell | 4424 | P: Rusty Russell |
@@ -4531,11 +4532,23 @@ F: include/linux/if_* | |||
4531 | F: include/linux/*device.h | 4532 | F: include/linux/*device.h |
4532 | 4533 | ||
4533 | NETXEN (1/10) GbE SUPPORT | 4534 | NETXEN (1/10) GbE SUPPORT |
4534 | M: Amit Kumar Salecha <amit.salecha@qlogic.com> | 4535 | M: Sony Chacko <sony.chacko@qlogic.com> |
4536 | M: Rajesh Borundia <rajesh.borundia@qlogic.com> | ||
4535 | L: netdev@vger.kernel.org | 4537 | L: netdev@vger.kernel.org |
4536 | W: http://www.qlogic.com | 4538 | W: http://www.qlogic.com |
4537 | S: Supported | 4539 | S: Supported |
4538 | F: drivers/net/netxen/ | 4540 | F: drivers/net/ethernet/qlogic/netxen/ |
4541 | |||
4542 | NFC SUBSYSTEM | ||
4543 | M: Lauro Ramos Venancio <lauro.venancio@openbossa.org> | ||
4544 | M: Aloisio Almeida Jr <aloisio.almeida@openbossa.org> | ||
4545 | M: Samuel Ortiz <sameo@linux.intel.com> | ||
4546 | L: linux-wireless@vger.kernel.org | ||
4547 | S: Maintained | ||
4548 | F: net/nfc/ | ||
4549 | F: include/linux/nfc.h | ||
4550 | F: include/net/nfc/ | ||
4551 | F: drivers/nfc/ | ||
4539 | 4552 | ||
4540 | NFS, SUNRPC, AND LOCKD CLIENTS | 4553 | NFS, SUNRPC, AND LOCKD CLIENTS |
4541 | M: Trond Myklebust <Trond.Myklebust@netapp.com> | 4554 | M: Trond Myklebust <Trond.Myklebust@netapp.com> |
@@ -4556,7 +4569,7 @@ M: Jan-Pascal van Best <janpascal@vanbest.org> | |||
4556 | M: Andreas Mohr <andi@lisas.de> | 4569 | M: Andreas Mohr <andi@lisas.de> |
4557 | L: netdev@vger.kernel.org | 4570 | L: netdev@vger.kernel.org |
4558 | S: Maintained | 4571 | S: Maintained |
4559 | F: drivers/net/ni5010.* | 4572 | F: drivers/net/ethernet/racal/ni5010.* |
4560 | 4573 | ||
4561 | NILFS2 FILESYSTEM | 4574 | NILFS2 FILESYSTEM |
4562 | M: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp> | 4575 | M: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp> |
@@ -4822,7 +4835,7 @@ PA SEMI ETHERNET DRIVER | |||
4822 | M: Olof Johansson <olof@lixom.net> | 4835 | M: Olof Johansson <olof@lixom.net> |
4823 | L: netdev@vger.kernel.org | 4836 | L: netdev@vger.kernel.org |
4824 | S: Maintained | 4837 | S: Maintained |
4825 | F: drivers/net/pasemi_mac.* | 4838 | F: drivers/net/ethernet/pasemi/* |
4826 | 4839 | ||
4827 | PA SEMI SMBUS DRIVER | 4840 | PA SEMI SMBUS DRIVER |
4828 | M: Olof Johansson <olof@lixom.net> | 4841 | M: Olof Johansson <olof@lixom.net> |
@@ -4969,7 +4982,7 @@ PCNET32 NETWORK DRIVER | |||
4969 | M: Don Fry <pcnet32@frontier.com> | 4982 | M: Don Fry <pcnet32@frontier.com> |
4970 | L: netdev@vger.kernel.org | 4983 | L: netdev@vger.kernel.org |
4971 | S: Maintained | 4984 | S: Maintained |
4972 | F: drivers/net/pcnet32.c | 4985 | F: drivers/net/ethernet/amd/pcnet32.c |
4973 | 4986 | ||
4974 | PCRYPT PARALLEL CRYPTO ENGINE | 4987 | PCRYPT PARALLEL CRYPTO ENGINE |
4975 | M: Steffen Klassert <steffen.klassert@secunet.com> | 4988 | M: Steffen Klassert <steffen.klassert@secunet.com> |
@@ -5101,7 +5114,7 @@ PPP PROTOCOL DRIVERS AND COMPRESSORS | |||
5101 | M: Paul Mackerras <paulus@samba.org> | 5114 | M: Paul Mackerras <paulus@samba.org> |
5102 | L: linux-ppp@vger.kernel.org | 5115 | L: linux-ppp@vger.kernel.org |
5103 | S: Maintained | 5116 | S: Maintained |
5104 | F: drivers/net/ppp_* | 5117 | F: drivers/net/ppp/ppp_* |
5105 | 5118 | ||
5106 | PPP OVER ATM (RFC 2364) | 5119 | PPP OVER ATM (RFC 2364) |
5107 | M: Mitchell Blank Jr <mitch@sfgoth.com> | 5120 | M: Mitchell Blank Jr <mitch@sfgoth.com> |
@@ -5112,8 +5125,8 @@ F: include/linux/atmppp.h | |||
5112 | PPP OVER ETHERNET | 5125 | PPP OVER ETHERNET |
5113 | M: Michal Ostrowski <mostrows@earthlink.net> | 5126 | M: Michal Ostrowski <mostrows@earthlink.net> |
5114 | S: Maintained | 5127 | S: Maintained |
5115 | F: drivers/net/pppoe.c | 5128 | F: drivers/net/ppp/pppoe.c |
5116 | F: drivers/net/pppox.c | 5129 | F: drivers/net/ppp/pppox.c |
5117 | 5130 | ||
5118 | PPP OVER L2TP | 5131 | PPP OVER L2TP |
5119 | M: James Chapman <jchapman@katalix.com> | 5132 | M: James Chapman <jchapman@katalix.com> |
@@ -5134,7 +5147,7 @@ PPTP DRIVER | |||
5134 | M: Dmitry Kozlov <xeb@mail.ru> | 5147 | M: Dmitry Kozlov <xeb@mail.ru> |
5135 | L: netdev@vger.kernel.org | 5148 | L: netdev@vger.kernel.org |
5136 | S: Maintained | 5149 | S: Maintained |
5137 | F: drivers/net/pptp.c | 5150 | F: drivers/net/ppp/pptp.c |
5138 | W: http://sourceforge.net/projects/accel-pptp | 5151 | W: http://sourceforge.net/projects/accel-pptp |
5139 | 5152 | ||
5140 | PREEMPTIBLE KERNEL | 5153 | PREEMPTIBLE KERNEL |
@@ -5163,7 +5176,7 @@ M: Geoff Levand <geoff@infradead.org> | |||
5163 | L: netdev@vger.kernel.org | 5176 | L: netdev@vger.kernel.org |
5164 | L: cbe-oss-dev@lists.ozlabs.org | 5177 | L: cbe-oss-dev@lists.ozlabs.org |
5165 | S: Maintained | 5178 | S: Maintained |
5166 | F: drivers/net/ps3_gelic_net.* | 5179 | F: drivers/net/ethernet/toshiba/ps3_gelic_net.* |
5167 | 5180 | ||
5168 | PS3 PLATFORM SUPPORT | 5181 | PS3 PLATFORM SUPPORT |
5169 | M: Geoff Levand <geoff@infradead.org> | 5182 | M: Geoff Levand <geoff@infradead.org> |
@@ -5281,23 +5294,24 @@ M: linux-driver@qlogic.com | |||
5281 | L: netdev@vger.kernel.org | 5294 | L: netdev@vger.kernel.org |
5282 | S: Supported | 5295 | S: Supported |
5283 | F: Documentation/networking/LICENSE.qla3xxx | 5296 | F: Documentation/networking/LICENSE.qla3xxx |
5284 | F: drivers/net/qla3xxx.* | 5297 | F: drivers/net/ethernet/qlogic/qla3xxx.* |
5285 | 5298 | ||
5286 | QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER | 5299 | QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER |
5287 | M: Amit Kumar Salecha <amit.salecha@qlogic.com> | ||
5288 | M: Anirban Chakraborty <anirban.chakraborty@qlogic.com> | 5300 | M: Anirban Chakraborty <anirban.chakraborty@qlogic.com> |
5301 | M: Sony Chacko <sony.chacko@qlogic.com> | ||
5289 | M: linux-driver@qlogic.com | 5302 | M: linux-driver@qlogic.com |
5290 | L: netdev@vger.kernel.org | 5303 | L: netdev@vger.kernel.org |
5291 | S: Supported | 5304 | S: Supported |
5292 | F: drivers/net/qlcnic/ | 5305 | F: drivers/net/ethernet/qlogic/qlcnic/ |
5293 | 5306 | ||
5294 | QLOGIC QLGE 10Gb ETHERNET DRIVER | 5307 | QLOGIC QLGE 10Gb ETHERNET DRIVER |
5308 | M: Anirban Chakraborty <anirban.chakraborty@qlogic.com> | ||
5295 | M: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> | 5309 | M: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> |
5296 | M: Ron Mercer <ron.mercer@qlogic.com> | 5310 | M: Ron Mercer <ron.mercer@qlogic.com> |
5297 | M: linux-driver@qlogic.com | 5311 | M: linux-driver@qlogic.com |
5298 | L: netdev@vger.kernel.org | 5312 | L: netdev@vger.kernel.org |
5299 | S: Supported | 5313 | S: Supported |
5300 | F: drivers/net/qlge/ | 5314 | F: drivers/net/ethernet/qlogic/qlge/ |
5301 | 5315 | ||
5302 | QNX4 FILESYSTEM | 5316 | QNX4 FILESYSTEM |
5303 | M: Anders Larsen <al@alarsen.net> | 5317 | M: Anders Larsen <al@alarsen.net> |
@@ -5379,7 +5393,7 @@ RDC R6040 FAST ETHERNET DRIVER | |||
5379 | M: Florian Fainelli <florian@openwrt.org> | 5393 | M: Florian Fainelli <florian@openwrt.org> |
5380 | L: netdev@vger.kernel.org | 5394 | L: netdev@vger.kernel.org |
5381 | S: Maintained | 5395 | S: Maintained |
5382 | F: drivers/net/r6040.c | 5396 | F: drivers/net/ethernet/rdc/r6040.c |
5383 | 5397 | ||
5384 | RDS - RELIABLE DATAGRAM SOCKETS | 5398 | RDS - RELIABLE DATAGRAM SOCKETS |
5385 | M: Andy Grover <andy.grover@oracle.com> | 5399 | M: Andy Grover <andy.grover@oracle.com> |
@@ -5783,7 +5797,7 @@ M: Ajit Khaparde <ajit.khaparde@emulex.com> | |||
5783 | L: netdev@vger.kernel.org | 5797 | L: netdev@vger.kernel.org |
5784 | W: http://www.emulex.com | 5798 | W: http://www.emulex.com |
5785 | S: Supported | 5799 | S: Supported |
5786 | F: drivers/net/benet/ | 5800 | F: drivers/net/ethernet/emulex/benet/ |
5787 | 5801 | ||
5788 | SFC NETWORK DRIVER | 5802 | SFC NETWORK DRIVER |
5789 | M: Solarflare linux maintainers <linux-net-drivers@solarflare.com> | 5803 | M: Solarflare linux maintainers <linux-net-drivers@solarflare.com> |
@@ -5791,7 +5805,7 @@ M: Steve Hodgson <shodgson@solarflare.com> | |||
5791 | M: Ben Hutchings <bhutchings@solarflare.com> | 5805 | M: Ben Hutchings <bhutchings@solarflare.com> |
5792 | L: netdev@vger.kernel.org | 5806 | L: netdev@vger.kernel.org |
5793 | S: Supported | 5807 | S: Supported |
5794 | F: drivers/net/sfc/ | 5808 | F: drivers/net/ethernet/sfc/ |
5795 | 5809 | ||
5796 | SGI GRU DRIVER | 5810 | SGI GRU DRIVER |
5797 | M: Jack Steiner <steiner@sgi.com> | 5811 | M: Jack Steiner <steiner@sgi.com> |
@@ -5857,14 +5871,14 @@ SIS 190 ETHERNET DRIVER | |||
5857 | M: Francois Romieu <romieu@fr.zoreil.com> | 5871 | M: Francois Romieu <romieu@fr.zoreil.com> |
5858 | L: netdev@vger.kernel.org | 5872 | L: netdev@vger.kernel.org |
5859 | S: Maintained | 5873 | S: Maintained |
5860 | F: drivers/net/sis190.c | 5874 | F: drivers/net/ethernet/sis/sis190.c |
5861 | 5875 | ||
5862 | SIS 900/7016 FAST ETHERNET DRIVER | 5876 | SIS 900/7016 FAST ETHERNET DRIVER |
5863 | M: Daniele Venzano <venza@brownhat.org> | 5877 | M: Daniele Venzano <venza@brownhat.org> |
5864 | W: http://www.brownhat.org/sis900.html | 5878 | W: http://www.brownhat.org/sis900.html |
5865 | L: netdev@vger.kernel.org | 5879 | L: netdev@vger.kernel.org |
5866 | S: Maintained | 5880 | S: Maintained |
5867 | F: drivers/net/sis900.* | 5881 | F: drivers/net/ethernet/sis/sis900.* |
5868 | 5882 | ||
5869 | SIS 96X I2C/SMBUS DRIVER | 5883 | SIS 96X I2C/SMBUS DRIVER |
5870 | M: "Mark M. Hoffman" <mhoffman@lightlink.com> | 5884 | M: "Mark M. Hoffman" <mhoffman@lightlink.com> |
@@ -5891,8 +5905,7 @@ SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS | |||
5891 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 5905 | M: Stephen Hemminger <shemminger@linux-foundation.org> |
5892 | L: netdev@vger.kernel.org | 5906 | L: netdev@vger.kernel.org |
5893 | S: Maintained | 5907 | S: Maintained |
5894 | F: drivers/net/skge.* | 5908 | F: drivers/net/ethernet/marvell/sk* |
5895 | F: drivers/net/sky2.* | ||
5896 | 5909 | ||
5897 | SLAB ALLOCATOR | 5910 | SLAB ALLOCATOR |
5898 | M: Christoph Lameter <cl@linux-foundation.org> | 5911 | M: Christoph Lameter <cl@linux-foundation.org> |
@@ -5906,7 +5919,7 @@ F: mm/sl?b.c | |||
5906 | SMC91x ETHERNET DRIVER | 5919 | SMC91x ETHERNET DRIVER |
5907 | M: Nicolas Pitre <nico@fluxnic.net> | 5920 | M: Nicolas Pitre <nico@fluxnic.net> |
5908 | S: Odd Fixes | 5921 | S: Odd Fixes |
5909 | F: drivers/net/smc91x.* | 5922 | F: drivers/net/ethernet/smsc/smc91x.* |
5910 | 5923 | ||
5911 | SMM665 HARDWARE MONITOR DRIVER | 5924 | SMM665 HARDWARE MONITOR DRIVER |
5912 | M: Guenter Roeck <linux@roeck-us.net> | 5925 | M: Guenter Roeck <linux@roeck-us.net> |
@@ -5941,13 +5954,13 @@ M: Steve Glendinning <steve.glendinning@smsc.com> | |||
5941 | L: netdev@vger.kernel.org | 5954 | L: netdev@vger.kernel.org |
5942 | S: Supported | 5955 | S: Supported |
5943 | F: include/linux/smsc911x.h | 5956 | F: include/linux/smsc911x.h |
5944 | F: drivers/net/smsc911x.* | 5957 | F: drivers/net/ethernet/smsc/smsc911x.* |
5945 | 5958 | ||
5946 | SMSC9420 PCI ETHERNET DRIVER | 5959 | SMSC9420 PCI ETHERNET DRIVER |
5947 | M: Steve Glendinning <steve.glendinning@smsc.com> | 5960 | M: Steve Glendinning <steve.glendinning@smsc.com> |
5948 | L: netdev@vger.kernel.org | 5961 | L: netdev@vger.kernel.org |
5949 | S: Supported | 5962 | S: Supported |
5950 | F: drivers/net/smsc9420.* | 5963 | F: drivers/net/ethernet/smsc/smsc9420.* |
5951 | 5964 | ||
5952 | SN-IA64 (Itanium) SUB-PLATFORM | 5965 | SN-IA64 (Itanium) SUB-PLATFORM |
5953 | M: Jes Sorensen <jes@sgi.com> | 5966 | M: Jes Sorensen <jes@sgi.com> |
@@ -5981,7 +5994,7 @@ SONIC NETWORK DRIVER | |||
5981 | M: Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 5994 | M: Thomas Bogendoerfer <tsbogend@alpha.franken.de> |
5982 | L: netdev@vger.kernel.org | 5995 | L: netdev@vger.kernel.org |
5983 | S: Maintained | 5996 | S: Maintained |
5984 | F: drivers/net/sonic.* | 5997 | F: drivers/net/ethernet/natsemi/sonic.* |
5985 | 5998 | ||
5986 | SONICS SILICON BACKPLANE DRIVER (SSB) | 5999 | SONICS SILICON BACKPLANE DRIVER (SSB) |
5987 | M: Michael Buesch <m@bues.ch> | 6000 | M: Michael Buesch <m@bues.ch> |
@@ -6122,7 +6135,7 @@ M: Jens Osterkamp <jens@de.ibm.com> | |||
6122 | L: netdev@vger.kernel.org | 6135 | L: netdev@vger.kernel.org |
6123 | S: Supported | 6136 | S: Supported |
6124 | F: Documentation/networking/spider_net.txt | 6137 | F: Documentation/networking/spider_net.txt |
6125 | F: drivers/net/spider_net* | 6138 | F: drivers/net/ethernet/toshiba/spider_net* |
6126 | 6139 | ||
6127 | SPU FILE SYSTEM | 6140 | SPU FILE SYSTEM |
6128 | M: Jeremy Kerr <jk@ozlabs.org> | 6141 | M: Jeremy Kerr <jk@ozlabs.org> |
@@ -6169,12 +6182,6 @@ M: Jakub Schmidtke <sjakub@gmail.com> | |||
6169 | S: Odd Fixes | 6182 | S: Odd Fixes |
6170 | F: drivers/staging/asus_oled/ | 6183 | F: drivers/staging/asus_oled/ |
6171 | 6184 | ||
6172 | STAGING - ATHEROS ATH6KL WIRELESS DRIVER | ||
6173 | M: Luis R. Rodriguez <mcgrof@gmail.com> | ||
6174 | M: Naveen Singh <nsingh@atheros.com> | ||
6175 | S: Odd Fixes | ||
6176 | F: drivers/staging/ath6kl/ | ||
6177 | |||
6178 | STAGING - COMEDI | 6185 | STAGING - COMEDI |
6179 | M: Ian Abbott <abbotti@mev.co.uk> | 6186 | M: Ian Abbott <abbotti@mev.co.uk> |
6180 | M: Mori Hess <fmhess@users.sourceforge.net> | 6187 | M: Mori Hess <fmhess@users.sourceforge.net> |
@@ -6300,7 +6307,7 @@ F: drivers/staging/xgifb/ | |||
6300 | STARFIRE/DURALAN NETWORK DRIVER | 6307 | STARFIRE/DURALAN NETWORK DRIVER |
6301 | M: Ion Badulescu <ionut@badula.org> | 6308 | M: Ion Badulescu <ionut@badula.org> |
6302 | S: Odd Fixes | 6309 | S: Odd Fixes |
6303 | F: drivers/net/starfire* | 6310 | F: drivers/net/ethernet/adaptec/starfire* |
6304 | 6311 | ||
6305 | SUN3/3X | 6312 | SUN3/3X |
6306 | M: Sam Creasey <sammy@sammy.net> | 6313 | M: Sam Creasey <sammy@sammy.net> |
@@ -6309,6 +6316,7 @@ S: Maintained | |||
6309 | F: arch/m68k/kernel/*sun3* | 6316 | F: arch/m68k/kernel/*sun3* |
6310 | F: arch/m68k/sun3*/ | 6317 | F: arch/m68k/sun3*/ |
6311 | F: arch/m68k/include/asm/sun3* | 6318 | F: arch/m68k/include/asm/sun3* |
6319 | F: drivers/net/ethernet/i825xx/sun3* | ||
6312 | 6320 | ||
6313 | SUPERH | 6321 | SUPERH |
6314 | M: Paul Mundt <lethal@linux-sh.org> | 6322 | M: Paul Mundt <lethal@linux-sh.org> |
@@ -6396,7 +6404,7 @@ TEHUTI ETHERNET DRIVER | |||
6396 | M: Andy Gospodarek <andy@greyhouse.net> | 6404 | M: Andy Gospodarek <andy@greyhouse.net> |
6397 | L: netdev@vger.kernel.org | 6405 | L: netdev@vger.kernel.org |
6398 | S: Supported | 6406 | S: Supported |
6399 | F: drivers/net/tehuti* | 6407 | F: drivers/net/ethernet/tehuti/* |
6400 | 6408 | ||
6401 | Telecom Clock Driver for MCPL0010 | 6409 | Telecom Clock Driver for MCPL0010 |
6402 | M: Mark Gross <mark.gross@intel.com> | 6410 | M: Mark Gross <mark.gross@intel.com> |
@@ -6447,7 +6455,7 @@ W: http://www.tilera.com/scm/ | |||
6447 | S: Supported | 6455 | S: Supported |
6448 | F: arch/tile/ | 6456 | F: arch/tile/ |
6449 | F: drivers/tty/hvc/hvc_tile.c | 6457 | F: drivers/tty/hvc/hvc_tile.c |
6450 | F: drivers/net/tile/ | 6458 | F: drivers/net/ethernet/tile/ |
6451 | F: drivers/edac/tile_edac.c | 6459 | F: drivers/edac/tile_edac.c |
6452 | 6460 | ||
6453 | TLAN NETWORK DRIVER | 6461 | TLAN NETWORK DRIVER |
@@ -6456,7 +6464,7 @@ L: tlan-devel@lists.sourceforge.net (subscribers-only) | |||
6456 | W: http://sourceforge.net/projects/tlan/ | 6464 | W: http://sourceforge.net/projects/tlan/ |
6457 | S: Maintained | 6465 | S: Maintained |
6458 | F: Documentation/networking/tlan.txt | 6466 | F: Documentation/networking/tlan.txt |
6459 | F: drivers/net/tlan.* | 6467 | F: drivers/net/ethernet/ti/tlan.* |
6460 | 6468 | ||
6461 | TOMOYO SECURITY MODULE | 6469 | TOMOYO SECURITY MODULE |
6462 | M: Kentaro Takeda <takedakn@nttdata.co.jp> | 6470 | M: Kentaro Takeda <takedakn@nttdata.co.jp> |
@@ -6550,7 +6558,7 @@ TULIP NETWORK DRIVERS | |||
6550 | M: Grant Grundler <grundler@parisc-linux.org> | 6558 | M: Grant Grundler <grundler@parisc-linux.org> |
6551 | L: netdev@vger.kernel.org | 6559 | L: netdev@vger.kernel.org |
6552 | S: Maintained | 6560 | S: Maintained |
6553 | F: drivers/net/tulip/ | 6561 | F: drivers/net/ethernet/tulip/ |
6554 | 6562 | ||
6555 | TUN/TAP driver | 6563 | TUN/TAP driver |
6556 | M: Maxim Krasnyansky <maxk@qualcomm.com> | 6564 | M: Maxim Krasnyansky <maxk@qualcomm.com> |
@@ -6596,7 +6604,7 @@ W: http://uclinux-h8.sourceforge.jp/ | |||
6596 | S: Supported | 6604 | S: Supported |
6597 | F: arch/h8300/ | 6605 | F: arch/h8300/ |
6598 | F: drivers/ide/ide-h8300.c | 6606 | F: drivers/ide/ide-h8300.c |
6599 | F: drivers/net/ne-h8300.c | 6607 | F: drivers/net/ethernet/8390/ne-h8300.c |
6600 | 6608 | ||
6601 | UDF FILESYSTEM | 6609 | UDF FILESYSTEM |
6602 | M: Jan Kara <jack@suse.cz> | 6610 | M: Jan Kara <jack@suse.cz> |
@@ -7024,7 +7032,7 @@ F: include/linux/vhost.h | |||
7024 | VIA RHINE NETWORK DRIVER | 7032 | VIA RHINE NETWORK DRIVER |
7025 | M: Roger Luethi <rl@hellgate.ch> | 7033 | M: Roger Luethi <rl@hellgate.ch> |
7026 | S: Maintained | 7034 | S: Maintained |
7027 | F: drivers/net/via-rhine.c | 7035 | F: drivers/net/ethernet/via/via-rhine.c |
7028 | 7036 | ||
7029 | VIAPRO SMBUS DRIVER | 7037 | VIAPRO SMBUS DRIVER |
7030 | M: Jean Delvare <khali@linux-fr.org> | 7038 | M: Jean Delvare <khali@linux-fr.org> |
@@ -7052,7 +7060,7 @@ VIA VELOCITY NETWORK DRIVER | |||
7052 | M: Francois Romieu <romieu@fr.zoreil.com> | 7060 | M: Francois Romieu <romieu@fr.zoreil.com> |
7053 | L: netdev@vger.kernel.org | 7061 | L: netdev@vger.kernel.org |
7054 | S: Maintained | 7062 | S: Maintained |
7055 | F: drivers/net/via-velocity.* | 7063 | F: drivers/net/ethernet/via/via-velocity.* |
7056 | 7064 | ||
7057 | VLAN (802.1Q) | 7065 | VLAN (802.1Q) |
7058 | M: Patrick McHardy <kaber@trash.net> | 7066 | M: Patrick McHardy <kaber@trash.net> |