diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
| commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
| tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /CREDITS | |
| parent | c0f1fe00c3923135b2c2f443448585482da8a53e (diff) | |
| parent | 5528e568a760442e0ec8fd2dea1f0791875a066b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
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 |