diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
| commit | c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 (patch) | |
| tree | 1c19f951f2604dbb6b867a6dcdf94d20c204cc5c /CREDITS | |
| parent | 382066da251132f768380f4852ed5afb72d88f80 (diff) | |
| parent | a8bd60705aa17a998516837d9c1e503ad4cbd7fc (diff) | |
Merge branch 'master'
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 | |||
| 3241 | S: Beaverton, Oregon 97005 | 3241 | S: Beaverton, Oregon 97005 |
| 3242 | S: USA | 3242 | S: USA |
| 3243 | 3243 | ||
| 3244 | N: Marcelo W. Tosatti | 3244 | N: Marcelo Tosatti |
| 3245 | E: marcelo.tosatti@cyclades.com | 3245 | E: marcelo@kvack.org |
| 3246 | D: Miscellaneous kernel hacker | ||
| 3247 | D: v2.4 kernel maintainer | 3246 | D: v2.4 kernel maintainer |
| 3248 | D: Current pc300/cyclades maintainer | ||
| 3249 | S: Cyclades Corporation | ||
| 3250 | S: Av Cristovao Colombo, 462. Floresta. | ||
| 3251 | S: Porto Alegre | ||
| 3252 | S: Brazil | 3247 | S: Brazil |
| 3253 | 3248 | ||
| 3254 | N: Stefan Traby | 3249 | N: Stefan Traby |