diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 05:14:47 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 05:14:47 -0500 |
| commit | a1be621dfacbef0fd374d8acd553d71e07bf29ac (patch) | |
| tree | 32b0355454b43b1098b5e01dd699fd7281abf781 /MAINTAINERS | |
| parent | 3612fdf780e28b10323dd12d2b0f306c7ada4d4c (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f1d45b975a1a..3c3ce2b20322 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 |