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

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a74a0c726134..77bb08606912 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -536,6 +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/
 S:      Maintained
 
 BUSLOGIC SCSI DRIVER
@@ -833,6 +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/
 S:      Supported
 
 EATA-DMA SCSI DRIVER
@@ -1634,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
@@ -2885,6 +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/
 S:      Maintained
 
 W1 DALLAS'S 1-WIRE BUS