diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2004-04-14 14:34:22 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2004-04-14 14:34:22 -0400 |
| commit | d63bce0550760bbde8ed65cffbdb91b1e36cb5d5 (patch) | |
| tree | 7c1f526e0b538d938a3b74ecfd476e583e8e5609 | |
| parent | 62e88cfdeabf75516364a9ab914c4120b4a25221 (diff) | |
| parent | aa617bb48f67805bf8f9d850f9199f2ae0215ab7 (diff) | |
Merge redhat.com:/spare/repo/linux-2.6
into redhat.com:/spare/repo/misc-2.6
| -rw-r--r-- | Documentation/networking/00-INDEX | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX index 12a0002e861b..029e9c71eb3a 100644 --- a/Documentation/networking/00-INDEX +++ b/Documentation/networking/00-INDEX @@ -111,8 +111,6 @@ tlan.txt - ThunderLAN (Compaq Netelligent 10/100, Olicom OC-2xxx) driver info. tms380tr.txt - SysKonnect Token Ring ISA/PCI adapter driver info. -tulip.txt - - info on using DEC 21040/21041/21140 based PCI Ethernet cards. tuntap.txt - TUN/TAP device driver, allowing user space Rx/Tx of packets. vortex.txt diff --git a/MAINTAINERS b/MAINTAINERS index cfa5bca2922e..690da4f47291 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2266,9 +2266,8 @@ M: hirofumi@mail.parknet.co.jp L: linux-kernel@vger.kernel.org S: Maintained -VIA 82Cxxx AUDIO DRIVER +VIA 82Cxxx AUDIO DRIVER (old OSS driver) P: Jeff Garzik -L: linux-via@gtf.org S: Odd fixes VIA RHINE NETWORK DRIVER |