diff options
author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-05 19:19:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-05 19:19:46 -0700 |
commit | fa8d24b9c057cbd45e58a5868f3b703b4e613c11 (patch) | |
tree | 1daec2ac57148963af86278b0548b3a3bf80bbb8 /CREDITS | |
parent | 50da7d0e7884c4ff01ab8aa9cf467b721ef681bf (diff) | |
parent | 15fea1233f1e35883f76b71c33859d5b62aca545 (diff) | |
download | history-fa8d24b9c057cbd45e58a5868f3b703b4e613c11.tar.gz |
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -2779,6 +2779,10 @@ N: Christopher Smith E: x@xman.org D: Tulip net driver hacker +N: Mark Smith +E: mark.smith@comdev.cc +D: Multicast support in bonding driver + N: Miquel van Smoorenburg E: miquels@cistron.nl D: Kernel and net hacker. Sysvinit, minicom. doing Debian stuff. |