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