diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /MAINTAINERS | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f15186032675..b0dc75a5e74e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1524,12 +1524,6 @@ M: davem@davemloft.net | |||
| 1524 | L: linux-kernel@vger.kernel.org | 1524 | L: linux-kernel@vger.kernel.org |
| 1525 | S: Maintained | 1525 | S: Maintained |
| 1526 | 1526 | ||
| 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 | 1527 | LAPB module |
| 1534 | P: Henner Eisen | 1528 | P: Henner Eisen |
| 1535 | M: eis@baty.hanse.de | 1529 | M: eis@baty.hanse.de |
| @@ -1752,7 +1746,8 @@ P: Ralf Baechle | |||
| 1752 | M: ralf@linux-mips.org | 1746 | M: ralf@linux-mips.org |
| 1753 | W: http://www.linux-mips.org/ | 1747 | W: http://www.linux-mips.org/ |
| 1754 | L: linux-mips@linux-mips.org | 1748 | L: linux-mips@linux-mips.org |
| 1755 | S: Maintained | 1749 | T: git www.linux-mips.org:/pub/scm/linux.git |
| 1750 | S: Supported | ||
| 1756 | 1751 | ||
| 1757 | MISCELLANEOUS MCA-SUPPORT | 1752 | MISCELLANEOUS MCA-SUPPORT |
| 1758 | P: James Bottomley | 1753 | P: James Bottomley |
| @@ -2901,6 +2896,14 @@ L: video4linux-list@redhat.com | |||
| 2901 | W: http://www.linux-projects.org | 2896 | W: http://www.linux-projects.org |
| 2902 | S: Maintained | 2897 | S: Maintained |
| 2903 | 2898 | ||
| 2899 | USB ZC0301 DRIVER | ||
| 2900 | P: Luca Risolia | ||
| 2901 | M: luca.risolia@studio.unibo.it | ||
| 2902 | L: linux-usb-devel@lists.sourceforge.net | ||
| 2903 | L: video4linux-list@redhat.com | ||
| 2904 | W: http://www.linux-projects.org | ||
| 2905 | S: Maintained | ||
| 2906 | |||
| 2904 | USB ZD1201 DRIVER | 2907 | USB ZD1201 DRIVER |
| 2905 | P: Jeroen Vreeken | 2908 | P: Jeroen Vreeken |
| 2906 | M: pe1rxq@amsat.org | 2909 | M: pe1rxq@amsat.org |