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