Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1fc80ec4999bcc6deff5035ef84a433beeb8b9ce..6af683025ae045101a510c30e0fb076bbdf97bda 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -536,7 +536,7 @@ P:  Mauro Carvalho Chehab
 M:     mchehab@brturbo.com.br
 L:     video4linux-list@redhat.com
 W:     http://linuxtv.org
-T:     quilt http://www.linuxtv.org/download/quilt/
+T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:     Maintained
 
 BUSLOGIC SCSI DRIVER
@@ -834,7 +834,7 @@ P:  LinuxTV.org Project
 M:     linux-dvb-maintainer@linuxtv.org
 L:     linux-dvb@linuxtv.org (subscription required)
 W:     http://linuxtv.org/
-T:     quilt http://www.linuxtv.org/download/quilt/
+T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:     Supported
 
 EATA-DMA SCSI DRIVER
@@ -1284,8 +1284,8 @@ T:        git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:     Supported
 
 INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS
-P:     Vojtech Pavlik
-M:     vojtech@suse.cz
+P:     Dmitry Torokhov
+M:     dtor_core@ameritech.net
 L:     linux-input@atrey.karlin.mff.cuni.cz
 L:     linux-joystick@atrey.karlin.mff.cuni.cz
 T:     git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
@@ -1636,6 +1636,15 @@ L:       ldm-devel@lists.sourceforge.net
 W:     http://ldm.sourceforge.net
 S:     Maintained
 
+LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
+P:     Eric Moore
+M:     Eric.Moore@lsil.com
+M:     support@lsil.com
+L:     mpt_linux_developer@lsil.com
+L:     linux-scsi@vger.kernel.org
+W:     http://www.lsilogic.com/support
+S:     Supported
+
 LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
 P:     Matthew Wilcox
 M:     matthew@wil.cx
@@ -2887,7 +2896,7 @@ P:        Mauro Carvalho Chehab
 M:     mchehab@brturbo.com.br
 L:     video4linux-list@redhat.com
 W:     http://linuxtv.org
-T:     quilt http://www.linuxtv.org/download/quilt/
+T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:     Maintained
 
 W1 DALLAS'S 1-WIRE BUS