diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-05-05 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-05 01:45:48 -0400 |
| commit | f18fc729cd2d67b76e24206ee3567c1f6983c358 (patch) | |
| tree | 9dbf177222d94213d9dd82d67de6d905e1a2b278 /CREDITS | |
| parent | 5a43ee65620d628ba04deecf241b63b2410b97f2 (diff) | |
| parent | d98550e334715b2d9e45f8f0f4e1608720108640 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 10 |
1 files changed, 2 insertions, 8 deletions
| @@ -1194,15 +1194,9 @@ S: Brecksville, OH 44141-1334 | |||
| 1194 | S: USA | 1194 | S: USA |
| 1195 | 1195 | ||
| 1196 | N: Tristan Greaves | 1196 | N: Tristan Greaves |
| 1197 | E: Tristan.Greaves@icl.com | 1197 | E: tristan@extricate.org |
| 1198 | E: tmg296@ecs.soton.ac.uk | 1198 | W: http://www.extricate.org/ |
| 1199 | W: http://www.ecs.soton.ac.uk/~tmg296 | ||
| 1200 | D: Miscellaneous ipv4 sysctl patches | 1199 | D: Miscellaneous ipv4 sysctl patches |
| 1201 | S: 15 Little Mead | ||
| 1202 | S: Denmead | ||
| 1203 | S: Hampshire | ||
| 1204 | S: PO7 6HS | ||
| 1205 | S: United Kingdom | ||
| 1206 | 1200 | ||
| 1207 | N: Michael A. Griffith | 1201 | N: Michael A. Griffith |
| 1208 | E: grif@cs.ucr.edu | 1202 | E: grif@cs.ucr.edu |