diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
| commit | e4ac2663ea27d5dda88d97d117080995fcfcd6d5 (patch) | |
| tree | 74eac23956a86546ed93eac973b0bc4744b97ccc /CREDITS | |
| parent | 4c2be501b7e8695f8bdf4f7d5f51595ed55eea44 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -2209,7 +2209,7 @@ S: (address available on request) | |||
| 2209 | S: USA | 2209 | S: USA |
| 2210 | 2210 | ||
| 2211 | N: Ian McDonald | 2211 | N: Ian McDonald |
| 2212 | E: iam4@cs.waikato.ac.nz | 2212 | E: ian.mcdonald@jandi.co.nz |
| 2213 | E: imcdnzl@gmail.com | 2213 | E: imcdnzl@gmail.com |
| 2214 | W: http://wand.net.nz/~iam4 | 2214 | W: http://wand.net.nz/~iam4 |
| 2215 | W: http://imcdnzl.blogspot.com | 2215 | W: http://imcdnzl.blogspot.com |