diff --git a/[refs] b/[refs] index d5336a35f8c8..1f2ad6b2df92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52e650407d709fd02091f0d735434def96a545bc +refs/heads/master: 455518e7b5ff53478821fe9185531e0a2135d076 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index ba8ded198b2b..b6bcc2f14083 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1244,11 +1244,10 @@ S: Supported F: drivers/net/tg3.* BROCADE BFA FC SCSI DRIVER -P: Jing Huang -M: huangj@brocade.com -L: linux-scsi@vger.kernel.org -S: Supported -F: drivers/scsi/bfa/ +M: Jing Huang +L: linux-scsi@vger.kernel.org +S: Supported +F: drivers/scsi/bfa/ BSG (block layer generic sg v4 driver) M: FUJITA Tomonori