diff options
author | Steven Whitehouse | 2006-05-25 18:40:08 +0200 |
---|---|---|
committer | Steven Whitehouse | 2006-05-25 18:40:08 +0200 |
commit | c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 (patch) | |
tree | 1c19f951f2604dbb6b867a6dcdf94d20c204cc5c /CREDITS | |
parent | [GFS2] Casts for printing 64bit numbers (diff) | |
parent | Linux 2.6.17-rc5 (diff) | |
download | kernel-qcow2-linux-c6a756795d5ba0637aae8da89dd11bb7e3a1ee74.tar.gz kernel-qcow2-linux-c6a756795d5ba0637aae8da89dd11bb7e3a1ee74.tar.xz kernel-qcow2-linux-c6a756795d5ba0637aae8da89dd11bb7e3a1ee74.zip |
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 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 |