aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS6
-rw-r--r--MAINTAINERS9
2 files changed, 15 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index a347520bef2d..5b1edf3a38a2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2247,6 +2247,12 @@ S: 249 Nichols Avenue
2247S: Syracuse, New York 13206 2247S: Syracuse, New York 13206
2248S: USA 2248S: USA
2249 2249
2250N: Kyle McMartin
2251E: kyle@parisc-linux.org
2252D: Linux/PARISC hacker
2253D: AD1889 sound driver
2254S: Ottawa, Canada
2255
2250N: Dirk Melchers 2256N: Dirk Melchers
2251E: dirk@merlin.nbg.sub.org 2257E: dirk@merlin.nbg.sub.org
2252D: 8 bit XT hard disk driver for OMTI5520 2258D: 8 bit XT hard disk driver for OMTI5520
diff --git a/MAINTAINERS b/MAINTAINERS
index 767fb610963e..248b93b32fc4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -197,6 +197,15 @@ M: Thorsten Knabe <linux@thorsten-knabe.de>
197W: http://linux.thorsten-knabe.de 197W: http://linux.thorsten-knabe.de
198S: Maintained 198S: Maintained
199 199
200AD1889 SOUND DRIVER
201P: Kyle McMartin
202M: kyle@parisc-linux.org
203P: Thibaut Varene
204M: T-Bone@parisc-linux.org
205W: http://wiki.parisc-linux.org/AD1889
206L: parisc-linux@lists.parisc-linux.org
207S: Maintained
208
200ADM1025 HARDWARE MONITOR DRIVER 209ADM1025 HARDWARE MONITOR DRIVER
201P: Jean Delvare 210P: Jean Delvare
202M: khali@linux-fr.org 211M: khali@linux-fr.org