aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS3
-rw-r--r--MAINTAINERS7
-rw-r--r--drivers/net/eexpress.c2
-rw-r--r--drivers/net/tokenring/abyss.c2
-rw-r--r--drivers/net/tokenring/abyss.h2
-rw-r--r--drivers/net/tokenring/madgemc.c2
-rw-r--r--drivers/net/tokenring/madgemc.h2
-rw-r--r--drivers/net/tokenring/proteon.c2
-rw-r--r--drivers/net/tokenring/skisa.c2
-rw-r--r--drivers/net/tokenring/tms380tr.c2
-rw-r--r--drivers/net/tokenring/tms380tr.h2
-rw-r--r--drivers/net/tokenring/tmspci.c2
-rw-r--r--drivers/scsi/aha1542.c2
13 files changed, 14 insertions, 18 deletions
diff --git a/CREDITS b/CREDITS
index 8018b8944e1f..da0a56e23bee 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1120,6 +1120,9 @@ S: 1150 Ringwood Court
1120S: San Jose, California 95131 1120S: San Jose, California 95131
1121S: USA 1121S: USA
1122 1122
1123N: Adam Fritzler
1124E: mid@zigamorph.net
1125
1123N: Fernando Fuganti 1126N: Fernando Fuganti
1124E: fuganti@conectiva.com.br 1127E: fuganti@conectiva.com.br
1125E: fuganti@netbank.com.br 1128E: fuganti@netbank.com.br
diff --git a/MAINTAINERS b/MAINTAINERS
index 58b16038baea..55d2b20c4906 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3822,13 +3822,6 @@ W: http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
3822T: git kernel.org:/pub/scm/linux/kernel/git/bunk/trivial.git 3822T: git kernel.org:/pub/scm/linux/kernel/git/bunk/trivial.git
3823S: Maintained 3823S: Maintained
3824 3824
3825TMS380 TOKEN-RING NETWORK DRIVER
3826P: Adam Fritzler
3827M: mid@auk.cx
3828L: linux-tr@linuxtr.net
3829W: http://www.auk.cx/tms380tr/
3830S: Maintained
3831
3832TULIP NETWORK DRIVER 3825TULIP NETWORK DRIVER
3833L: tulip-users@lists.sourceforge.net 3826L: tulip-users@lists.sourceforge.net
3834W: http://sourceforge.net/projects/tulip/ 3827W: http://sourceforge.net/projects/tulip/
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index d5459a8056b1..2eb82aba4a8b 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -9,7 +9,7 @@
9 * Many modifications, and currently maintained, by 9 * Many modifications, and currently maintained, by
10 * Philip Blundell <philb@gnu.org> 10 * Philip Blundell <philb@gnu.org>
11 * Added the Compaq LTE Alan Cox <alan@redhat.com> 11 * Added the Compaq LTE Alan Cox <alan@redhat.com>
12 * Added MCA support Adam Fritzler <mid@auk.cx> 12 * Added MCA support Adam Fritzler
13 * 13 *
14 * Note - this driver is experimental still - it has problems on faster 14 * Note - this driver is experimental still - it has problems on faster
15 * machines. Someone needs to sit down and go through it line by line with 15 * machines. Someone needs to sit down and go through it line by line with
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 124cfd4fbcf4..7a7de0469eae 100644
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -10,7 +10,7 @@
10 * - Madge Smart 16/4 PCI Mk2 10 * - Madge Smart 16/4 PCI Mk2
11 * 11 *
12 * Maintainer(s): 12 * Maintainer(s):
13 * AF Adam Fritzler mid@auk.cx 13 * AF Adam Fritzler
14 * 14 *
15 * Modification History: 15 * Modification History:
16 * 30-Dec-99 AF Split off from the tms380tr driver. 16 * 30-Dec-99 AF Split off from the tms380tr driver.
diff --git a/drivers/net/tokenring/abyss.h b/drivers/net/tokenring/abyss.h
index 0ee6e4f085b1..b0a473b89133 100644
--- a/drivers/net/tokenring/abyss.h
+++ b/drivers/net/tokenring/abyss.h
@@ -2,7 +2,7 @@
2 * abyss.h: Header for the abyss tms380tr module 2 * abyss.h: Header for the abyss tms380tr module
3 * 3 *
4 * Authors: 4 * Authors:
5 * - Adam Fritzler <mid@auk.cx> 5 * - Adam Fritzler
6 */ 6 */
7 7
8#ifndef __LINUX_MADGETR_H 8#ifndef __LINUX_MADGETR_H
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 5a4151362fc0..c9c5a2b1ed9e 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -11,7 +11,7 @@
11 * - Madge Smart 16/4 Ringnode MC32 (??) 11 * - Madge Smart 16/4 Ringnode MC32 (??)
12 * 12 *
13 * Maintainer(s): 13 * Maintainer(s):
14 * AF Adam Fritzler mid@auk.cx 14 * AF Adam Fritzler
15 * 15 *
16 * Modification History: 16 * Modification History:
17 * 16-Jan-00 AF Created 17 * 16-Jan-00 AF Created
diff --git a/drivers/net/tokenring/madgemc.h b/drivers/net/tokenring/madgemc.h
index 2dd822203809..fe88e272c531 100644
--- a/drivers/net/tokenring/madgemc.h
+++ b/drivers/net/tokenring/madgemc.h
@@ -2,7 +2,7 @@
2 * madgemc.h: Header for the madgemc tms380tr module 2 * madgemc.h: Header for the madgemc tms380tr module
3 * 3 *
4 * Authors: 4 * Authors:
5 * - Adam Fritzler <mid@auk.cx> 5 * - Adam Fritzler
6 */ 6 */
7 7
8#ifndef __LINUX_MADGEMC_H 8#ifndef __LINUX_MADGEMC_H
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index ca6b65919b3d..00ea94513460 100644
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -12,7 +12,7 @@
12 * - Proteon 1392, 1392+ 12 * - Proteon 1392, 1392+
13 * 13 *
14 * Maintainer(s): 14 * Maintainer(s):
15 * AF Adam Fritzler mid@auk.cx 15 * AF Adam Fritzler
16 * JF Jochen Friedrich jochen@scram.de 16 * JF Jochen Friedrich jochen@scram.de
17 * 17 *
18 * Modification History: 18 * Modification History:
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index 32e8d5a9f958..41b6999a0f33 100644
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -13,7 +13,7 @@
13 * - SysKonnect TR4/16(+) ISA (SK-4190) 13 * - SysKonnect TR4/16(+) ISA (SK-4190)
14 * 14 *
15 * Maintainer(s): 15 * Maintainer(s):
16 * AF Adam Fritzler mid@auk.cx 16 * AF Adam Fritzler
17 * JF Jochen Friedrich jochen@scram.de 17 * JF Jochen Friedrich jochen@scram.de
18 * 18 *
19 * Modification History: 19 * Modification History:
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index d5fa36d36515..d07c4523c847 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -30,7 +30,7 @@
30 * Maintainer(s): 30 * Maintainer(s):
31 * JS Jay Schulist jschlst@samba.org 31 * JS Jay Schulist jschlst@samba.org
32 * CG Christoph Goos cgoos@syskonnect.de 32 * CG Christoph Goos cgoos@syskonnect.de
33 * AF Adam Fritzler mid@auk.cx 33 * AF Adam Fritzler
34 * MLP Mike Phillips phillim@amtrak.com 34 * MLP Mike Phillips phillim@amtrak.com
35 * JF Jochen Friedrich jochen@scram.de 35 * JF Jochen Friedrich jochen@scram.de
36 * 36 *
diff --git a/drivers/net/tokenring/tms380tr.h b/drivers/net/tokenring/tms380tr.h
index 7daf74e31ccd..7af76d708849 100644
--- a/drivers/net/tokenring/tms380tr.h
+++ b/drivers/net/tokenring/tms380tr.h
@@ -3,7 +3,7 @@
3 * 3 *
4 * Authors: 4 * Authors:
5 * - Christoph Goos <cgoos@syskonnect.de> 5 * - Christoph Goos <cgoos@syskonnect.de>
6 * - Adam Fritzler <mid@auk.cx> 6 * - Adam Fritzler
7 */ 7 */
8 8
9#ifndef __LINUX_TMS380TR_H 9#ifndef __LINUX_TMS380TR_H
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index 1c18f782f522..5f0ee880cfff 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -14,7 +14,7 @@
14 * - 3Com 3C339 Token Link Velocity 14 * - 3Com 3C339 Token Link Velocity
15 * 15 *
16 * Maintainer(s): 16 * Maintainer(s):
17 * AF Adam Fritzler mid@auk.cx 17 * AF Adam Fritzler
18 * 18 *
19 * Modification History: 19 * Modification History:
20 * 30-Dec-99 AF Split off from the tms380tr driver. 20 * 30-Dec-99 AF Split off from the tms380tr driver.
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 190568ebea3c..5a1471c370fa 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -21,7 +21,7 @@
21 * Modified by Chris Faulhaber <jedgar@fxp.org> 21 * Modified by Chris Faulhaber <jedgar@fxp.org>
22 * Added module command-line options 22 * Added module command-line options
23 * 19-Jul-99 23 * 19-Jul-99
24 * Modified by Adam Fritzler <mid@auk.cx> 24 * Modified by Adam Fritzler
25 * Added proper detection of the AHA-1640 (MCA version of AHA-1540) 25 * Added proper detection of the AHA-1640 (MCA version of AHA-1540)
26 */ 26 */
27 27