diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2012-10-02 03:55:12 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-10-02 03:55:12 -0400 |
| commit | fe709ed827d370e6b0c0a9f9456da1c22bdcd118 (patch) | |
| tree | c5a7fd72a745a5f6656a58acc9a1d277e26f9595 /MAINTAINERS | |
| parent | 1c4cf1d5845b59cdcbfad8e67272cf5b219ab062 (diff) | |
| parent | 0644f5393e915f13733bcc65f13195ff39aeb63e (diff) | |
Merge SCSI misc branch into isci-for-3.6 tag
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fdc0119963e7..efffdb4c7118 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1645,7 +1645,6 @@ F: drivers/bcma/ | |||
| 1645 | F: include/linux/bcma/ | 1645 | F: include/linux/bcma/ |
| 1646 | 1646 | ||
| 1647 | BROCADE BFA FC SCSI DRIVER | 1647 | BROCADE BFA FC SCSI DRIVER |
| 1648 | M: Jing Huang <huangj@brocade.com> | ||
| 1649 | M: Krishna C Gudipati <kgudipat@brocade.com> | 1648 | M: Krishna C Gudipati <kgudipat@brocade.com> |
| 1650 | L: linux-scsi@vger.kernel.org | 1649 | L: linux-scsi@vger.kernel.org |
| 1651 | S: Supported | 1650 | S: Supported |
| @@ -3431,6 +3430,13 @@ L: netdev@vger.kernel.org | |||
| 3431 | S: Supported | 3430 | S: Supported |
| 3432 | F: drivers/net/ethernet/ibm/ibmveth.* | 3431 | F: drivers/net/ethernet/ibm/ibmveth.* |
| 3433 | 3432 | ||
| 3433 | IBM Power Virtual SCSI/FC Device Drivers | ||
| 3434 | M: Robert Jennings <rcj@linux.vnet.ibm.com> | ||
| 3435 | L: linux-scsi@vger.kernel.org | ||
| 3436 | S: Supported | ||
| 3437 | F: drivers/scsi/ibmvscsi/ | ||
| 3438 | X: drivers/scsi/ibmvscsi/ibmvstgt.c | ||
| 3439 | |||
| 3434 | IBM ServeRAID RAID DRIVER | 3440 | IBM ServeRAID RAID DRIVER |
| 3435 | P: Jack Hammer | 3441 | P: Jack Hammer |
| 3436 | M: Dave Jeffery <ipslinux@adaptec.com> | 3442 | M: Dave Jeffery <ipslinux@adaptec.com> |