aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS6
-rw-r--r--MAINTAINERS4
2 files changed, 6 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 550bb2b9fe8b..86a0bb278a6e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1165,6 +1165,12 @@ S: 600 North Bell Avenue, Suite 160
1165S: Carnegie, Pennsylvania 15106-4304 1165S: Carnegie, Pennsylvania 15106-4304
1166S: USA 1166S: USA
1167 1167
1168N: Kai Germaschewski
1169E: kai@germaschewski.name
1170D: Major kbuild rework during the 2.5 cycle
1171D: ISDN Maintainer
1172S: USA
1173
1168N: Philip Gladstone 1174N: Philip Gladstone
1169E: philip@gladstonefamily.net 1175E: philip@gladstonefamily.net
1170D: Kernel / timekeeping stuff 1176D: Kernel / timekeeping stuff
diff --git a/MAINTAINERS b/MAINTAINERS
index c4eca56ed5bf..b97e53deb6e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2119,8 +2119,6 @@ S: Maintained
2119ISDN SUBSYSTEM 2119ISDN SUBSYSTEM
2120P: Karsten Keil 2120P: Karsten Keil
2121M: kkeil@suse.de 2121M: kkeil@suse.de
2122P: Kai Germaschewski
2123M: kai.germaschewski@gmx.de
2124L: isdn4linux@listserv.isdn4linux.de 2122L: isdn4linux@listserv.isdn4linux.de
2125W: http://www.isdn4linux.de 2123W: http://www.isdn4linux.de
2126T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git 2124T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git
@@ -2189,8 +2187,6 @@ L: autofs@linux.kernel.org
2189S: Maintained 2187S: Maintained
2190 2188
2191KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*) 2189KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*)
2192P: Kai Germaschewski
2193M: kai@germaschewski.name
2194P: Sam Ravnborg 2190P: Sam Ravnborg
2195M: sam@ravnborg.org 2191M: sam@ravnborg.org
2196T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git 2192T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git