diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /MAINTAINERS | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8db5c339845d..bfd7fbfe90ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -534,7 +534,7 @@ S: Supported | |||
| 534 | BROADBAND PROCESSOR ARCHITECTURE | 534 | BROADBAND PROCESSOR ARCHITECTURE |
| 535 | P: Arnd Bergmann | 535 | P: Arnd Bergmann |
| 536 | M: arnd@arndb.de | 536 | M: arnd@arndb.de |
| 537 | L: linuxppc64-dev@ozlabs.org | 537 | L: linuxppc-dev@ozlabs.org |
| 538 | W: http://linuxppc64.org | 538 | W: http://linuxppc64.org |
| 539 | S: Supported | 539 | S: Supported |
| 540 | 540 | ||
| @@ -1349,10 +1349,10 @@ S: Maintained | |||
| 1349 | INTEL PRO/100 ETHERNET SUPPORT | 1349 | INTEL PRO/100 ETHERNET SUPPORT |
| 1350 | P: John Ronciak | 1350 | P: John Ronciak |
| 1351 | M: john.ronciak@intel.com | 1351 | M: john.ronciak@intel.com |
| 1352 | P: Ganesh Venkatesan | ||
| 1353 | M: ganesh.venkatesan@intel.com | ||
| 1354 | P: Jesse Brandeburg | 1352 | P: Jesse Brandeburg |
| 1355 | M: jesse.brandeburg@intel.com | 1353 | M: jesse.brandeburg@intel.com |
| 1354 | P: Jeff Kirsher | ||
| 1355 | M: jeffrey.t.kirsher@intel.com | ||
| 1356 | W: http://sourceforge.net/projects/e1000/ | 1356 | W: http://sourceforge.net/projects/e1000/ |
| 1357 | S: Supported | 1357 | S: Supported |
| 1358 | 1358 | ||
| @@ -1361,18 +1361,22 @@ P: Jeb Cramer | |||
| 1361 | M: cramerj@intel.com | 1361 | M: cramerj@intel.com |
| 1362 | P: John Ronciak | 1362 | P: John Ronciak |
| 1363 | M: john.ronciak@intel.com | 1363 | M: john.ronciak@intel.com |
| 1364 | P: Ganesh Venkatesan | 1364 | P: Jesse Brandeburg |
| 1365 | M: ganesh.venkatesan@intel.com | 1365 | M: jesse.brandeburg@intel.com |
| 1366 | P: Jeff Kirsher | ||
| 1367 | M: jeffrey.t.kirsher@intel.com | ||
| 1366 | W: http://sourceforge.net/projects/e1000/ | 1368 | W: http://sourceforge.net/projects/e1000/ |
| 1367 | S: Supported | 1369 | S: Supported |
| 1368 | 1370 | ||
| 1369 | INTEL PRO/10GbE SUPPORT | 1371 | INTEL PRO/10GbE SUPPORT |
| 1372 | P: Jeff Kirsher | ||
| 1373 | M: jeffrey.t.kirsher@intel.com | ||
| 1370 | P: Ayyappan Veeraiyan | 1374 | P: Ayyappan Veeraiyan |
| 1371 | M: ayyappan.veeraiyan@intel.com | 1375 | M: ayyappan.veeraiyan@intel.com |
| 1372 | P: Ganesh Venkatesan | ||
| 1373 | M: ganesh.venkatesan@intel.com | ||
| 1374 | P: John Ronciak | 1376 | P: John Ronciak |
| 1375 | M: john.ronciak@intel.com | 1377 | M: john.ronciak@intel.com |
| 1378 | P: Jesse Brandeburg | ||
| 1379 | M: jesse.brandeburg@intel.com | ||
| 1376 | W: http://sourceforge.net/projects/e1000/ | 1380 | W: http://sourceforge.net/projects/e1000/ |
| 1377 | S: Supported | 1381 | S: Supported |
| 1378 | 1382 | ||
| @@ -1524,12 +1528,6 @@ M: davem@davemloft.net | |||
| 1524 | L: linux-kernel@vger.kernel.org | 1528 | L: linux-kernel@vger.kernel.org |
| 1525 | S: Maintained | 1529 | S: Maintained |
| 1526 | 1530 | ||
| 1527 | LANMEDIA WAN CARD DRIVER | ||
| 1528 | P: Andrew Stanley-Jones | ||
| 1529 | M: asj@lanmedia.com | ||
| 1530 | W: http://www.lanmedia.com/ | ||
| 1531 | S: Supported | ||
| 1532 | |||
| 1533 | LAPB module | 1531 | LAPB module |
| 1534 | P: Henner Eisen | 1532 | P: Henner Eisen |
| 1535 | M: eis@baty.hanse.de | 1533 | M: eis@baty.hanse.de |
| @@ -1626,7 +1624,7 @@ P: Anton Blanchard | |||
| 1626 | M: anton@samba.org | 1624 | M: anton@samba.org |
| 1627 | M: anton@au.ibm.com | 1625 | M: anton@au.ibm.com |
| 1628 | W: http://linuxppc64.org | 1626 | W: http://linuxppc64.org |
| 1629 | L: linuxppc64-dev@ozlabs.org | 1627 | L: linuxppc-dev@ozlabs.org |
| 1630 | S: Supported | 1628 | S: Supported |
| 1631 | 1629 | ||
| 1632 | LINUX SECURITY MODULE (LSM) FRAMEWORK | 1630 | LINUX SECURITY MODULE (LSM) FRAMEWORK |
| @@ -2147,7 +2145,7 @@ S: Maintained | |||
| 2147 | 2145 | ||
| 2148 | QLOGIC QLA2XXX FC-SCSI DRIVER | 2146 | QLOGIC QLA2XXX FC-SCSI DRIVER |
| 2149 | P: Andrew Vasquez | 2147 | P: Andrew Vasquez |
| 2150 | M: andrew.vasquez@qlogic.com | 2148 | M: linux-driver@qlogic.com |
| 2151 | L: linux-scsi@vger.kernel.org | 2149 | L: linux-scsi@vger.kernel.org |
| 2152 | S: Supported | 2150 | S: Supported |
| 2153 | 2151 | ||
| @@ -2902,6 +2900,14 @@ L: video4linux-list@redhat.com | |||
| 2902 | W: http://www.linux-projects.org | 2900 | W: http://www.linux-projects.org |
| 2903 | S: Maintained | 2901 | S: Maintained |
| 2904 | 2902 | ||
| 2903 | USB ZC0301 DRIVER | ||
| 2904 | P: Luca Risolia | ||
| 2905 | M: luca.risolia@studio.unibo.it | ||
| 2906 | L: linux-usb-devel@lists.sourceforge.net | ||
| 2907 | L: video4linux-list@redhat.com | ||
| 2908 | W: http://www.linux-projects.org | ||
| 2909 | S: Maintained | ||
| 2910 | |||
| 2905 | USB ZD1201 DRIVER | 2911 | USB ZD1201 DRIVER |
| 2906 | P: Jeroen Vreeken | 2912 | P: Jeroen Vreeken |
| 2907 | M: pe1rxq@amsat.org | 2913 | M: pe1rxq@amsat.org |