diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
| commit | cf57a308436653f3094590202c77459aab250ff3 (patch) | |
| tree | 8a9e7096e494141911147a1f24865c3d79d583c1 /MAINTAINERS | |
| parent | faac9bd0e3ce7cb0572ec66e0a426cacf6afa970 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index afb86341b10..801829dee74 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -871,6 +871,8 @@ S: Maintained | |||
| 871 | DOCBOOK FOR DOCUMENTATION | 871 | DOCBOOK FOR DOCUMENTATION |
| 872 | P: Martin Waitz | 872 | P: Martin Waitz |
| 873 | M: tali@admingilde.org | 873 | M: tali@admingilde.org |
| 874 | P: Randy Dunlap | ||
| 875 | M: rdunlap@xenotime.net | ||
| 874 | T: git http://tali.admingilde.org/git/linux-docbook.git | 876 | T: git http://tali.admingilde.org/git/linux-docbook.git |
| 875 | S: Maintained | 877 | S: Maintained |
| 876 | 878 | ||
| @@ -2316,6 +2318,14 @@ M: promise@pnd-pc.demon.co.uk | |||
| 2316 | W: http://www.pnd-pc.demon.co.uk/promise/ | 2318 | W: http://www.pnd-pc.demon.co.uk/promise/ |
| 2317 | S: Maintained | 2319 | S: Maintained |
| 2318 | 2320 | ||
| 2321 | PVRUSB2 VIDEO4LINUX DRIVER | ||
| 2322 | P: Mike Isely | ||
| 2323 | M: isely@pobox.com | ||
| 2324 | L: pvrusb2@isely.net | ||
| 2325 | L: video4linux-list@redhat.com | ||
| 2326 | W: http://www.isely.net/pvrusb2/ | ||
| 2327 | S: Maintained | ||
| 2328 | |||
| 2319 | PXA2xx SUPPORT | 2329 | PXA2xx SUPPORT |
| 2320 | P: Nicolas Pitre | 2330 | P: Nicolas Pitre |
| 2321 | M: nico@cam.org | 2331 | M: nico@cam.org |