diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /MAINTAINERS | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9c592aa0280c..c39fb20f8589 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -838,7 +838,6 @@ S: Maintained | |||
| 838 | 838 | ||
| 839 | DVB SUBSYSTEM AND DRIVERS | 839 | DVB SUBSYSTEM AND DRIVERS |
| 840 | P: LinuxTV.org Project | 840 | P: LinuxTV.org Project |
| 841 | M: mchehab@infradead.org | ||
| 842 | M: v4l-dvb-maintainer@linuxtv.org | 841 | M: v4l-dvb-maintainer@linuxtv.org |
| 843 | L: linux-dvb@linuxtv.org (subscription required) | 842 | L: linux-dvb@linuxtv.org (subscription required) |
| 844 | W: http://linuxtv.org/ | 843 | W: http://linuxtv.org/ |