--- zzzz-none-000/linux-2.4.17/CREDITS	2001-12-21 17:41:53.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/CREDITS	2004-11-24 13:22:10.000000000 +0000
@@ -340,7 +340,7 @@
 S: Brunswick House, 61-69 Newmarket Rd, Cambridge CB5 8EG
 S: United Kingdom
 
-N: Thomas Bogendörfer
+N: Thomas Bogend÷rfer
 E: tsbogend@alpha.franken.de
 D: PCnet32 driver, SONIC driver, JAZZ_ESP driver
 D: newport abscon driver, g364 framebuffer driver
@@ -360,7 +360,7 @@
 D: Configuration help text support
 D: Linux CD and Support Giveaway List
 
-N: Erik Inge Bolsø
+N: Erik Inge Bols°
 E: knan@mo.himolde.no
 D: Misc kernel hacks
 
@@ -388,7 +388,7 @@
 S: Montreal, Quebec
 S: Canada
 
-N: Zoltán Böszörményi
+N: Zoltßn B÷sz÷rm‰nyi
 E: zboszor@mail.externet.hu
 D: MTRR emulation with Cyrix style ARR registers, Athlon MTRR support
 
@@ -610,6 +610,13 @@
 S: Bucharest
 S: Romania
 
+N: Dan Cox:
+E: danc@mvista.com
+D: PowerPC SMP work
+D: Synergy-Micro 'Gemini' port
+S: Tucson, Arizona
+S: USA
+
 N: Laurence Culhane
 E: loz@holmes.demon.co.uk
 D: Wrote the initial alpha SLIP code
@@ -881,11 +888,11 @@
 D: APM driver (early port)
 D: DRM drivers (author of several)
 
-N: János Farkas
+N: Jßnos Farkas
 E: chexum@shadow.banki.hu
 D: romfs, various (mostly networking) fixes
 P: 1024/F81FB2E1 41 B7 E4 E6 3E D4 A6 71  6D 9C F3 9F F2 BF DF 6E
-S: Madarász Viktor utca 25
+S: Madarßsz Viktor utca 25
 S: 1131 Budapest
 S: Hungary
 
@@ -897,10 +904,10 @@
 S: Los Gatos, CA 95033-8942
 S: USA
 
-N: Jürgen Fischer
+N: J’rgen Fischer
 E: fischer@norbit.de (=?iso-8859-1?q?J=FCrgen?= Fischer)
 D: Author of Adaptec AHA-152x SCSI driver
-S: Schulstraße 18
+S: Schulstraže 18
 S: 26506 Norden
 S: Germany
 
@@ -966,13 +973,13 @@
 D: random kernel hacker, ZF MachZ Watchdog driver
 S: Conectiva S.A.
 S: R. Tocantins, 89 - Cristo Rei
-S: 80050-430 - Curitiba - Paraná
+S: 80050-430 - Curitiba - Paranß
 S: Brazil
 
 N: Nigel Gamble
 E: nigel@nrg.org
-E: nigel@sgi.com
 D: Interrupt-driven printer driver
+D: Preemptible kernel
 S: 120 Alley Way
 S: Mountain View, California 94040
 S: USA
@@ -1100,12 +1107,12 @@
 S: Toronto, Ontario, M4Y 2W4
 S: Canada
 
-N: Richard Günther
+N: Richard G’nther
 E: rguenth@tat.physik.uni-tuebingen.de
 W: http://www.tat.physik.uni-tuebingen.de/~rguenth
 P: 2048/2E829319 2F 83 FC 93 E9 E4 19 E2  93 7A 32 42 45 37 23 57
 D: binfmt_misc
-S: 72074 Tübingen
+S: 72074 T’bingen
 S: Germany
 
 N: Justin Guyett
@@ -1129,7 +1136,7 @@
 E: haible@ma2s2.mathematik.uni-karlsruhe.de
 D: SysV FS, shm swapping, memory management fixes
 S: 17 rue Danton
-S: F - 94270 Le Kremlin-Bicêtre
+S: F - 94270 Le Kremlin-BicŠtre
 S: France
 
 N: Greg Hankins
@@ -1207,7 +1214,7 @@
 E: hch@infradead.org
 D: misc driver & makefile hacking
 D: freevxfs driver
-S: Triftstraße 26
+S: Triftstraže 26
 S: 38644 Goslar
 S: Germany
 
@@ -1416,7 +1423,7 @@
 W: http://www.image.dk/~nkbj
 D: Miscellaneous kernel updates and fixes.
 S: Dr. Holsts Vej 34, lejl. 164
-S: DK-8230 Åbyhøj
+S: DK-8230 Êbyh°j
 S: Denmark
 
 N: Michael K. Johnson
@@ -1647,7 +1654,7 @@
 N: Jakob Kemi
 E: jakob.kemi@telia.com
 D: V4L W9966 Webcam driver
-S: Forsbyvägen 33
+S: Forsbyv„gen 33
 S: 74143 Knivsta
 S: Sweden
 
@@ -1806,7 +1813,7 @@
 S: Gainesville, Florida 32608
 S: USA
 
-N: Martin von Löwis
+N: Martin von L÷wis
 E: loewis@informatik.hu-berlin.de
 D: script binary format
 D: NTFS driver
@@ -1866,10 +1873,15 @@
 S: Halifax, Nova Scotia
 S: Canada B3J 3C8
 
-N: Kai Mäkisara
+N: Kai M„kisara
 E: Kai.Makisara@metla.fi
 D: SCSI Tape Driver
 
+N: Dan Malek
+E: dan@embeddededge.com
+D: PowerPC 8xx, 4xx work.
+S: USA
+
 N: Asit Mallick
 E: asit.k.mallick@intel.com
 D: Linux/IA-64
@@ -1995,7 +2007,7 @@
 D: i18n for minicom, net-tools, util-linux, fetchmail, etc
 S: Conectiva S.A.
 S: R. Tocantins, 89 - Cristo Rei
-S: 80050-430 - Curitiba - Paraná
+S: 80050-430 - Curitiba - Paranß
 S: Brazil
 
 N: Karsten Merker
@@ -2344,7 +2356,7 @@
 E: stelian.pop@fr.alcove.com
 P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0  D3F7 7185 9E7A EDBB 6147
 D: sonypi, meye drivers, mct_u232 usb serial hacks
-S: Alcôve
+S: AlcŸve
 S: 153, bd. Anatole France 
 S: 93200 Saint Denis
 S: France
@@ -2353,6 +2365,14 @@
 E: fpotter@cirpack.com
 D: Some PCI kernel support
 
+N: Matt Porter
+E: mporter@mvista.com
+D: Motorola PowerPC PReP support
+D: cPCI PowerPC support
+D: Embedded PowerPC 6xx/7xx/74xx support
+S: Tempe, Arizona 85282
+S: USA
+
 N: Rui Prior
 E: rprior@inescn.pt
 D: ATM device driver for NICStAR based cards
@@ -2388,10 +2408,10 @@
 E: quintela@fi.udc.es
 D: Memory Management hacking
 S: LFCIA
-S: Departamento de Computación
-S: Universidade da Coruña
+S: Departamento de Computacin
+S: Universidade da Coru±a
 S: E-15071
-S: A Coruña
+S: A Coru±a
 S: Spain
 
 N: Augusto Cesar Radtke
@@ -2452,7 +2472,7 @@
 D: nl.linux.org administrator, minor scheduler additions
 S: Conectiva S.A.
 S: R. Tocantins, 89 - Cristo Rei
-S: 80050-430 - Curitiba - Paraná
+S: 80050-430 - Curitiba - Paranß
 S: Brazil
 
 N: Pekka Riikonen
@@ -2464,6 +2484,12 @@
 S: 70110 Kuopio
 S: Finland
 
+N: Tom Rini
+E: trini@kernel.crashing.org
+D: Lots of PowerPC cleanups, minor matroxfb work
+S: Tucson, Arizona
+S: USA
+
 N: William E. Roadcap
 E: roadcapw@cfw.com
 W: http://www.cfw.com/~roadcapw
@@ -2518,6 +2544,11 @@
 S: 95170 Deuil La Barre
 S: France
 
+N: Frank Rowand
+E: frowand@mvista.com
+D: PowerPC 4xx
+S: USA
+
 N: Sebastien Rougeaux
 E: Sebastien.Rougeaux@syseng.anu.edu.au
 D: IEEE 1394 OHCI module
@@ -2530,7 +2561,7 @@
 D: Support for EtherExpress 10 ISA (i82595) in eepro driver
 S: Conectiva S.A.
 S: R. Tocantins, 89 - Cristo Rei
-S: 80050-430 - Curitiba - Paraná
+S: 80050-430 - Curitiba - Paranß
 S: Brazil
 
 N: Alessandro Rubini
@@ -2599,6 +2630,12 @@
 S: 03600 Karkkila
 S: Finland
 
+N: Deepak Saxena
+E: deepak@csociety.purdue.edu
+D: I2O kernel layer (config, block, core, pci, net). I2O disk support for LILO
+D: XScale(IOP310) porting
+S: Tempe, Arizona
+
 N: Eric Schenk
 E: Eric.Schenk@dna.lth.se
 D: Random kernel debugging.
@@ -2831,7 +2868,7 @@
 D: Miscellaneous kernel hacker (mostly VM/MM work)
 S: Conectiva S.A.
 S: R. Tocantins, 89 - Cristo Rei
-S: 80050-430 - Curitiba - Paraná
+S: 80050-430 - Curitiba - Paranß
 S: Brazil
 
 N: Stefan Traby
@@ -2859,15 +2896,15 @@
 S: MacGregor A.C.T 2615
 S: Australia
 
-N: Winfried Trümper
+N: Winfried Tr’mper
 E: winni@xpilot.org
 W: http://www.shop.de/~winni/
 D: German HOWTO, Crash-Kurs Linux (German, 100 comprehensive pages)
 D: CD-Writing HOWTO, various mini-HOWTOs
 D: One-week tutorials on Linux twice a year (free of charge)
-D: Linux-Workshop Köln (aka LUG Cologne, Germany), Installfests
+D: Linux-Workshop K÷ln (aka LUG Cologne, Germany), Installfests
 S: Tacitusstr. 6
-S: D-50968 Köln
+S: D-50968 K÷ln
 
 N: Tsu-Sheng Tsao
 E: tsusheng@scf.usc.edu