diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-03 07:35:23 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-03 07:35:23 +0200 |
commit | e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (patch) | |
tree | 4e1ca325dde22f1ac21c9da0be509e87e922e604 /Documentation/networking/00-INDEX | |
parent | [NETNS]: Do not include net/net_namespace.h from seq_file.h (diff) | |
parent | [VLAN]: Proc entry is not renamed when vlan device name changes. (diff) | |
download | linux-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.tar.xz linux-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/s2io.c
Diffstat (limited to 'Documentation/networking/00-INDEX')
-rw-r--r-- | Documentation/networking/00-INDEX | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX index 02e56d447a8f..c485ee028bd9 100644 --- a/Documentation/networking/00-INDEX +++ b/Documentation/networking/00-INDEX @@ -84,9 +84,6 @@ policy-routing.txt - IP policy-based routing ray_cs.txt - Raylink Wireless LAN card driver info. -sk98lin.txt - - Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit - Ethernet Adapter family driver info skfp.txt - SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info. smc9.txt |