Skip to content

L
linux
Commit 0874802c authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://gkernel.bkbits.net/misc-2.6 

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 32686b9d d63bce05
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
Documentation/networking/00-INDEX
View file @ 0874802c
...@@ -111,8 +111,6 @@ tlan.txt ...@@ -111,8 +111,6 @@ tlan.txt
- ThunderLAN (Compaq Netelligent 10/100, Olicom OC-2xxx) driver info. - ThunderLAN (Compaq Netelligent 10/100, Olicom OC-2xxx) driver info.
tms380tr.txt tms380tr.txt
- SysKonnect Token Ring ISA/PCI adapter driver info. - SysKonnect Token Ring ISA/PCI adapter driver info.
tulip.txt
- info on using DEC 21040/21041/21140 based PCI Ethernet cards.
tuntap.txt tuntap.txt
- TUN/TAP device driver, allowing user space Rx/Tx of packets. - TUN/TAP device driver, allowing user space Rx/Tx of packets.
vortex.txt vortex.txt
......
MAINTAINERS
View file @ 0874802c
...@@ -2276,9 +2276,8 @@ M: hirofumi@mail.parknet.co.jp ...@@ -2276,9 +2276,8 @@ M: hirofumi@mail.parknet.co.jp
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
S: Maintained S: Maintained
VIA 82Cxxx AUDIO DRIVER VIA 82Cxxx AUDIO DRIVER (old OSS driver)
P: Jeff Garzik P: Jeff Garzik
L: linux-via@gtf.org
S: Odd fixes S: Odd fixes
VIA RHINE NETWORK DRIVER VIA RHINE NETWORK DRIVER
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7