diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /Documentation/networking/DLINK.txt | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'Documentation/networking/DLINK.txt')
| -rw-r--r-- | Documentation/networking/DLINK.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/networking/DLINK.txt b/Documentation/networking/DLINK.txt index 083d24752b83..55d24433d151 100644 --- a/Documentation/networking/DLINK.txt +++ b/Documentation/networking/DLINK.txt | |||
| @@ -178,10 +178,9 @@ Released 1994-06-13 | |||
| 178 | 7. ACKNOWLEDGMENTS. | 178 | 7. ACKNOWLEDGMENTS. |
| 179 | 179 | ||
| 180 | These drivers wouldn't have been done without the base | 180 | These drivers wouldn't have been done without the base |
| 181 | (and support) from Ross Biro <bir7@leland.stanford.edu>, | 181 | (and support) from Ross Biro, and D-Link Systems Inc. |
| 182 | and D-Link Systems Inc. The driver relies upon GPL-ed | 182 | The driver relies upon GPL-ed source from D-Link Systems Inc. |
| 183 | source from D-Link Systems Inc. and from Russel Nelson at | 183 | and from Russel Nelson at Crynwr Software <nelson@crynwr.com>. |
| 184 | Crynwr Software <nelson@crynwr.com>. | ||
| 185 | 184 | ||
| 186 | Additional input also from: | 185 | Additional input also from: |
| 187 | Donald Becker <becker@super.org>, Alan Cox <A.Cox@swansea.ac.uk> | 186 | Donald Becker <becker@super.org>, Alan Cox <A.Cox@swansea.ac.uk> |