diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
| commit | 5dd8816aeb1f068ade0349a22009ff7a66f25413 (patch) | |
| tree | c56ff327b1dfa8868b4208aea9ac4158e3bfe308 /CREDITS | |
| parent | f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc (diff) | |
| parent | 0c056c50a6218e0e577817c16ba8851af593d742 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -3241,14 +3241,9 @@ S: 12725 SW Millikan Way, Suite 400 S: Beaverton, Oregon 97005 S: USA -N: Marcelo W. Tosatti -E: marcelo.tosatti@cyclades.com -D: Miscellaneous kernel hacker +N: Marcelo Tosatti +E: marcelo@kvack.org D: v2.4 kernel maintainer -D: Current pc300/cyclades maintainer -S: Cyclades Corporation -S: Av Cristovao Colombo, 462. Floresta. -S: Porto Alegre S: Brazil N: Stefan Traby |