diff --git a/[refs] b/[refs] index 5ea0ea969911..147dbd6819ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a0ea09ad5352efce8fe79ed853150449903b9f5 +refs/heads/master: 5e9772b95ba848516b2c76c11cf6f4aa4aa232a5 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7157311eeb30..7642365ed6d2 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4630,6 +4630,12 @@ M: Robert Jarzmik L: rtc-linux@googlegroups.com S: Maintained +QLOGIC QLA1280 SCSI DRIVER +M: Michael Reed +L: linux-scsi@vger.kernel.org +S: Maintained +F: drivers/scsi/qla1280.[ch] + QLOGIC QLA2XXX FC-SCSI DRIVER M: Andrew Vasquez M: linux-driver@qlogic.com