diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-03-06 12:13:52 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-03-06 12:13:52 -0500 |
| commit | 1264fa6f8c5bf561a86128b2d48ace53e3f1e66f (patch) | |
| tree | 69872715982d49ddea5819040c7032062376183b /MAINTAINERS | |
| parent | efeff568677aa325f84d3ce37c219019887a79eb (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-fixes
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 59fd2d1d94a..1c2ca1dc66f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2464,7 +2464,7 @@ S: Maintained | |||
| 2464 | 2464 | ||
| 2465 | ISDN SUBSYSTEM | 2465 | ISDN SUBSYSTEM |
| 2466 | P: Karsten Keil | 2466 | P: Karsten Keil |
| 2467 | M: kkeil@suse.de | 2467 | M: isdn@linux-pingi.de |
| 2468 | L: isdn4linux@listserv.isdn4linux.de (subscribers-only) | 2468 | L: isdn4linux@listserv.isdn4linux.de (subscribers-only) |
| 2469 | W: http://www.isdn4linux.de | 2469 | W: http://www.isdn4linux.de |
| 2470 | T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git | 2470 | T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git |