diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 01:35:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 01:35:23 -0400 |
| commit | e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (patch) | |
| tree | 4e1ca325dde22f1ac21c9da0be509e87e922e604 /Documentation/networking/00-INDEX | |
| parent | c0f39322c335412339dec16ebfd2a05ceba5ebcf (diff) | |
| parent | 802fb176d8c635ae42da31b80841c26e8c7338a0 (diff) | |
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 | |||
| 84 | - IP policy-based routing | 84 | - IP policy-based routing |
| 85 | ray_cs.txt | 85 | ray_cs.txt |
| 86 | - Raylink Wireless LAN card driver info. | 86 | - Raylink Wireless LAN card driver info. |
| 87 | sk98lin.txt | ||
| 88 | - Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit | ||
| 89 | Ethernet Adapter family driver info | ||
| 90 | skfp.txt | 87 | skfp.txt |
| 91 | - SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info. | 88 | - SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info. |
| 92 | smc9.txt | 89 | smc9.txt |