aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS44
-rw-r--r--MAINTAINERS4
2 files changed, 24 insertions, 24 deletions
diff --git a/CREDITS b/CREDITS
index 80e241304b8e..6829e91a88d4 100644
--- a/CREDITS
+++ b/CREDITS
@@ -380,7 +380,7 @@ S: FutureTV Labs Ltd
380S: Brunswick House, 61-69 Newmarket Rd, Cambridge CB5 8EG 380S: Brunswick House, 61-69 Newmarket Rd, Cambridge CB5 8EG
381S: United Kingdom 381S: United Kingdom
382 382
383N: Thomas Bogendörfer 383N: Thomas Bogendörfer
384E: tsbogend@alpha.franken.de 384E: tsbogend@alpha.franken.de
385D: PCnet32 driver, SONIC driver, JAZZ_ESP driver 385D: PCnet32 driver, SONIC driver, JAZZ_ESP driver
386D: newport abscon driver, g364 framebuffer driver 386D: newport abscon driver, g364 framebuffer driver
@@ -400,7 +400,7 @@ W: http://math-www.uni-paderborn.de/~axel/
400D: Configuration help text support 400D: Configuration help text support
401D: Linux CD and Support Giveaway List 401D: Linux CD and Support Giveaway List
402 402
403N: Erik Inge Bolsø 403N: Erik Inge Bolsø
404E: knan@mo.himolde.no 404E: knan@mo.himolde.no
405D: Misc kernel hacks 405D: Misc kernel hacks
406 406
@@ -428,7 +428,7 @@ D: Various fixes (mostly networking)
428S: Montreal, Quebec 428S: Montreal, Quebec
429S: Canada 429S: Canada
430 430
431N: Zoltán Böszörményi 431N: Zoltán Böszörményi
432E: zboszor@mail.externet.hu 432E: zboszor@mail.externet.hu
433D: MTRR emulation with Cyrix style ARR registers, Athlon MTRR support 433D: MTRR emulation with Cyrix style ARR registers, Athlon MTRR support
434 434
@@ -1029,11 +1029,11 @@ D: Future Domain TMC-16x0 SCSI driver (author)
1029D: APM driver (early port) 1029D: APM driver (early port)
1030D: DRM drivers (author of several) 1030D: DRM drivers (author of several)
1031 1031
1032N: János Farkas 1032N: János Farkas
1033E: chexum@shadow.banki.hu 1033E: chexum@shadow.banki.hu
1034D: romfs, various (mostly networking) fixes 1034D: romfs, various (mostly networking) fixes
1035P: 1024/F81FB2E1 41 B7 E4 E6 3E D4 A6 71 6D 9C F3 9F F2 BF DF 6E 1035P: 1024/F81FB2E1 41 B7 E4 E6 3E D4 A6 71 6D 9C F3 9F F2 BF DF 6E
1036S: Madarász Viktor utca 25 1036S: Madarász Viktor utca 25
1037S: 1131 Budapest 1037S: 1131 Budapest
1038S: Hungary 1038S: Hungary
1039 1039
@@ -1044,10 +1044,10 @@ D: UDF filesystem
1044S: (ask for current address) 1044S: (ask for current address)
1045S: USA 1045S: USA
1046 1046
1047N: Jürgen Fischer 1047N: Jürgen Fischer
1048E: fischer@norbit.de (=?iso-8859-1?q?J=FCrgen?= Fischer) 1048E: fischer@norbit.de
1049D: Author of Adaptec AHA-152x SCSI driver 1049D: Author of Adaptec AHA-152x SCSI driver
1050S: Schulstraße 18 1050S: Schulstraße 18
1051S: 26506 Norden 1051S: 26506 Norden
1052S: Germany 1052S: Germany
1053 1053
@@ -1113,7 +1113,7 @@ E: fuganti@netbank.com.br
1113D: random kernel hacker, ZF MachZ Watchdog driver 1113D: random kernel hacker, ZF MachZ Watchdog driver
1114S: Conectiva S.A. 1114S: Conectiva S.A.
1115S: R. Tocantins, 89 - Cristo Rei 1115S: R. Tocantins, 89 - Cristo Rei
1116S: 80050-430 - Curitiba - Paraná 1116S: 80050-430 - Curitiba - Paraná
1117S: Brazil 1117S: Brazil
1118 1118
1119N: Kumar Gala 1119N: Kumar Gala
@@ -1258,12 +1258,12 @@ S: 44 St. Joseph Street, Suite 506
1258S: Toronto, Ontario, M4Y 2W4 1258S: Toronto, Ontario, M4Y 2W4
1259S: Canada 1259S: Canada
1260 1260
1261N: Richard Günther 1261N: Richard Günther
1262E: rguenth@tat.physik.uni-tuebingen.de 1262E: rguenth@tat.physik.uni-tuebingen.de
1263W: http://www.tat.physik.uni-tuebingen.de/~rguenth 1263W: http://www.tat.physik.uni-tuebingen.de/~rguenth
1264P: 2048/2E829319 2F 83 FC 93 E9 E4 19 E2 93 7A 32 42 45 37 23 57 1264P: 2048/2E829319 2F 83 FC 93 E9 E4 19 E2 93 7A 32 42 45 37 23 57
1265D: binfmt_misc 1265D: binfmt_misc
1266S: 72074 Tübingen 1266S: 72074 Tübingen
1267S: Germany 1267S: Germany
1268 1268
1269N: Justin Guyett 1269N: Justin Guyett
@@ -1287,7 +1287,7 @@ N: Bruno Haible
1287E: haible@ma2s2.mathematik.uni-karlsruhe.de 1287E: haible@ma2s2.mathematik.uni-karlsruhe.de
1288D: SysV FS, shm swapping, memory management fixes 1288D: SysV FS, shm swapping, memory management fixes
1289S: 17 rue Danton 1289S: 17 rue Danton
1290S: F - 94270 Le Kremlin-Bicêtre 1290S: F - 94270 Le Kremlin-Bicêtre
1291S: France 1291S: France
1292 1292
1293N: Greg Hankins 1293N: Greg Hankins
@@ -1701,7 +1701,7 @@ S: Czech Republic
1701N: Jakob Kemi 1701N: Jakob Kemi
1702E: jakob.kemi@telia.com 1702E: jakob.kemi@telia.com
1703D: V4L W9966 Webcam driver 1703D: V4L W9966 Webcam driver
1704S: Forsbyvägen 33 1704S: Forsbyvägen 33
1705S: 74143 Knivsta 1705S: 74143 Knivsta
1706S: Sweden 1706S: Sweden
1707 1707
@@ -2065,7 +2065,7 @@ D: misc. kernel hacking and debugging
2065S: Cambridge, MA 02139 2065S: Cambridge, MA 02139
2066S: USA 2066S: USA
2067 2067
2068N: Martin von Löwis 2068N: Martin von Löwis
2069E: loewis@informatik.hu-berlin.de 2069E: loewis@informatik.hu-berlin.de
2070D: script binary format 2070D: script binary format
2071D: NTFS driver 2071D: NTFS driver
@@ -2142,7 +2142,7 @@ S: PO BOX 220, HFX. CENTRAL
2142S: Halifax, Nova Scotia 2142S: Halifax, Nova Scotia
2143S: Canada B3J 3C8 2143S: Canada B3J 3C8
2144 2144
2145N: Kai Mäkisara 2145N: Kai Mäkisara
2146E: Kai.Makisara@kolumbus.fi 2146E: Kai.Makisara@kolumbus.fi
2147D: SCSI Tape Driver 2147D: SCSI Tape Driver
2148 2148
@@ -2785,10 +2785,10 @@ N: Juan Quintela
2785E: quintela@fi.udc.es 2785E: quintela@fi.udc.es
2786D: Memory Management hacking 2786D: Memory Management hacking
2787S: LFCIA 2787S: LFCIA
2788S: Departamento de Computación 2788S: Departamento de Computación
2789S: Universidade da Coruña 2789S: Universidade da Coruña
2790S: E-15071 2790S: E-15071
2791S: A Coruña 2791S: A Coruña
2792S: Spain 2792S: Spain
2793 2793
2794N: Augusto Cesar Radtke 2794N: Augusto Cesar Radtke
@@ -2939,7 +2939,7 @@ E: aris@cathedrallabs.org
2939D: Support for EtherExpress 10 ISA (i82595) in eepro driver 2939D: Support for EtherExpress 10 ISA (i82595) in eepro driver
2940D: User level driver support for input 2940D: User level driver support for input
2941S: R. Jose Serrato, 130 - Santa Candida 2941S: R. Jose Serrato, 130 - Santa Candida
2942S: 82640-320 - Curitiba - Paraná 2942S: 82640-320 - Curitiba - Paraná
2943S: Brazil 2943S: Brazil
2944 2944
2945N: Alessandro Rubini 2945N: Alessandro Rubini
@@ -3345,15 +3345,15 @@ P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87 CA26 189B 9946 D0FE 7AFB
3345D: rcutorture maintainer 3345D: rcutorture maintainer
3346D: lock annotations, finding and fixing lock bugs 3346D: lock annotations, finding and fixing lock bugs
3347 3347
3348N: Winfried Trümper 3348N: Winfried Trümper
3349E: winni@xpilot.org 3349E: winni@xpilot.org
3350W: http://www.shop.de/~winni/ 3350W: http://www.shop.de/~winni/
3351D: German HOWTO, Crash-Kurs Linux (German, 100 comprehensive pages) 3351D: German HOWTO, Crash-Kurs Linux (German, 100 comprehensive pages)
3352D: CD-Writing HOWTO, various mini-HOWTOs 3352D: CD-Writing HOWTO, various mini-HOWTOs
3353D: One-week tutorials on Linux twice a year (free of charge) 3353D: One-week tutorials on Linux twice a year (free of charge)
3354D: Linux-Workshop Köln (aka LUG Cologne, Germany), Installfests 3354D: Linux-Workshop Köln (aka LUG Cologne, Germany), Installfests
3355S: Tacitusstr. 6 3355S: Tacitusstr. 6
3356S: D-50968 Köln 3356S: D-50968 Köln
3357 3357
3358N: Tsu-Sheng Tsao 3358N: Tsu-Sheng Tsao
3359E: tsusheng@scf.usc.edu 3359E: tsusheng@scf.usc.edu
diff --git a/MAINTAINERS b/MAINTAINERS
index 41a4b477c576..be37a06bd314 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2800,7 +2800,7 @@ L: linux-abi-devel@lists.sourceforge.net
2800S: Maintained 2800S: Maintained
2801 2801
2802PHRAM MTD DRIVER 2802PHRAM MTD DRIVER
2803P: Jörn Engel 2803P: Jörn Engel
2804M: joern@wh.fh-wedel.de 2804M: joern@wh.fh-wedel.de
2805L: linux-mtd@lists.infradead.org 2805L: linux-mtd@lists.infradead.org
2806S: Maintained 2806S: Maintained
@@ -3074,7 +3074,7 @@ T: git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
3074S: Maintained 3074S: Maintained
3075 3075
3076SCSI TAPE DRIVER 3076SCSI TAPE DRIVER
3077P: Kai Mäkisara 3077P: Kai Mäkisara
3078M: Kai.Makisara@kolumbus.fi 3078M: Kai.Makisara@kolumbus.fi
3079L: linux-scsi@vger.kernel.org 3079L: linux-scsi@vger.kernel.org
3080S: Maintained 3080S: Maintained