diff --git a/[refs] b/[refs] index b1b5fdc96a0a..760b7f945fb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4deedd845a322b3d356d80c87e2d9fcf50aa04be +refs/heads/master: c4de0cebc512148bee764bfdac7bf49555e41173 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7a9ccda2a307..9ca2fbbe5255 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -131,19 +131,12 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/typhoon* -3W-9XXX SATA-RAID CONTROLLER DRIVER -M: Adam Radford +3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS) +M: Adam Radford L: linux-scsi@vger.kernel.org -W: http://www.amcc.com +W: http://www.lsi.com S: Supported -F: drivers/scsi/3w-9xxx* - -3W-XXXX ATA-RAID CONTROLLER DRIVER -M: Adam Radford -L: linux-scsi@vger.kernel.org -W: http://www.amcc.com -S: Supported -F: drivers/scsi/3w-xxxx* +F: drivers/scsi/3w-* 53C700 AND 53C700-66 SCSI DRIVER M: "James E.J. Bottomley"