This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index c0bdfc5..22252bd 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -46,11 +46,13 @@ D: Various kernel patches
 S: United Kingdom
 
 N: Werner Almesberger
-E: werner@almesberger.net
-W: http://www.almesberger.net/
+E: werner.almesberger@epfl.ch
 D: dosfs, LILO, some fd features, ATM, various other hacks here and there
-S: Buenos Aires
-S: Argentina
+S: Ecole Polytechnique Federale de Lausanne
+S: DSC ICA
+S: INN (Ecublens)
+S: CH-1015 Lausanne
+S: Switzerland
 
 N: Tim Alpaerts
 E: tim_alpaerts@toyota-motor-europe.com
@@ -495,14 +497,6 @@ E: m@mbsks.franken.de
 D: REINER SCT cyberJack pinpad/e-com USB chipcard reader driver
 S: Germany
 
-N: Adrian Bunk
-E: bunk@stusta.de
-P: 1024D/4F12B400  B29C E71E FE19 6755 5C8A  84D4 99FC EA98 4F12 B400
-D: misc kernel hacking and testing
-S: Grasmeierstrasse 11
-S: 80805 Muenchen
-S: Germany
-
 N: Ray Burr
 E: ryb@nightmare.com
 D: Original author of Amiga FFS filesystem
@@ -1893,7 +1887,7 @@ D: Early protocol filter for bridging code
 D: Bug fixes
 
 N: Paul Laufer
-E: paul@laufernet.com
+E: pelaufer@csupomona.edu
 D: Soundblaster driver fixes, ISAPnP quirk
 S: California, USA
 
@@ -2770,7 +2764,7 @@ N: Luca Risolia
 E: luca.risolia@studio.unibo.it
 P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958  5D40 99DA 5D2A FCE6 35A4
 D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips
-D: V4L2 driver for SN9C10x PC Camera Controllers
+D: V4L2 driver for SN9C10[12] PC Camera Controllers
 S: Via Liberta' 41/A
 S: Osio Sotto, 24046, Bergamo
 S: Italy