diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:36:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:36:08 -0400 |
| commit | 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb (patch) | |
| tree | addbc37a278a126a19e03edd8270e577c75a8829 /CREDITS | |
| parent | 8d4ee71ff6de5255ebfdf44fb83419d27bd06368 (diff) | |
| parent | e2a7f77a7b4ab298a38c8d1f624628456069bdb0 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
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 |