Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-3.10.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4db63de9652a31ca8c83a25d562cacd8329072f4..aa1d9d702e2dc2ffff0b4d4145ef1509bd3151f4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -363,6 +363,13 @@ L: linux-atm-general@lists.sourceforge.net
 W:     http://linux-atm.sourceforge.net
 S:     Maintained
 
+AUDIT SUBSYSTEM
+P:     David Woodhouse
+M:     dwmw2@infradead.org
+L:     linux-audit@redhat.com
+W:     http://people.redhat.com/sgrubb/audit/
+S:     Maintained
+
 ATMEL WIRELESS DRIVER
 P:     Simon Kelley
 M:     simon@thekelleys.org.uk
@@ -512,11 +519,11 @@ W:        http://linuxppc64.org
 S:     Supported
 
 BTTV VIDEO4LINUX DRIVER
-P:     Gerd Knorr
-M:     kraxel@bytesex.org
+P:     Mauro Carvalho Chehab
+M:     mchehab@brturbo.com.br
 L:     video4linux-list@redhat.com
-W:     http://bytesex.org/bttv/
-S:     Orphan
+W:     http://linuxtv.org
+S:     Maintained
 
 BUSLOGIC SCSI DRIVER
 P:     Leonard N. Zubkoff
@@ -2625,10 +2632,11 @@ W:      http://rio500.sourceforge.net
 S:     Maintained
 
 VIDEO FOR LINUX
-P:     Gerd Knorr
-M:     kraxel@bytesex.org
+P:     Mauro Carvalho Chehab
+M:     mchehab@brturbo.com.br
 L:     video4linux-list@redhat.com
-S:     Orphan
+W:     http://linuxtv.org
+S:     Maintained
 
 W1 DALLAS'S 1-WIRE BUS
 P:     Evgeniy Polyakov