diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 11:13:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 11:13:11 -0700 |
| commit | d4e06701b89286a306b31e20ec69a904fae374a1 (patch) | |
| tree | f6adefd65b021ccddb7655109ea8b9ab4e714292 /MAINTAINERS | |
| parent | e4980371059ca4a81ccdcb4381c41af8869ca711 (diff) | |
| parent | 87045b033a62777337ae4aa62834876da09b5fb5 (diff) | |
| download | linux-d4e06701b89286a306b31e20ec69a904fae374a1.tar.gz linux-d4e06701b89286a306b31e20ec69a904fae374a1.tar.bz2 linux-d4e06701b89286a306b31e20ec69a904fae374a1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (77 commits)
[SCSI] fix crash in scsi_dispatch_cmd()
[SCSI] sr: check_events() ignore GET_EVENT when TUR says otherwise
[SCSI] bnx2i: Fixed kernel panic due to illegal usage of sc->request->cpu
[SCSI] bfa: Update the driver version to 3.0.2.1
[SCSI] bfa: Driver and BSG enhancements.
[SCSI] bfa: Added support to query PHY.
[SCSI] bfa: Added HBA diagnostics support.
[SCSI] bfa: Added support for flash configuration
[SCSI] bfa: Added support to obtain SFP info.
[SCSI] bfa: Added support for CEE info and stats query.
[SCSI] bfa: Extend BSG interface.
[SCSI] bfa: FCS bug fixes.
[SCSI] bfa: DMA memory allocation enhancement.
[SCSI] bfa: Brocade-1860 Fabric Adapter vHBA support.
[SCSI] bfa: Brocade-1860 Fabric Adapter PLL init fixes.
[SCSI] bfa: Added Fabric Assigned Address(FAA) support
[SCSI] bfa: IOC bug fixes.
[SCSI] bfa: Enable ASIC block configuration and query.
[SCSI] bnx2i: Updated copyright and bump version
[SCSI] bnx2i: Modified to skip CNIC registration if iSCSI is not supported
...
Fix up some trivial conflicts in:
- drivers/scsi/bnx2fc/{bnx2fc.h,bnx2fc_fcoe.c}:
Crazy broadcom version number conflicts
- drivers/target/tcm_fc/tfc_cmd.c
Just trivial cleanups done on adjacent lines
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 75214405d61a..612316c352a2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1553,6 +1553,12 @@ L: linux-wireless@vger.kernel.org S: Supported F: drivers/staging/brcm80211/ +BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER +M: Bhanu Prakash Gollapudi <bprakash@broadcom.com> +L: linux-scsi@vger.kernel.org +S: Supported +F: drivers/scsi/bnx2fc/ + BROCADE BFA FC SCSI DRIVER M: Jing Huang <huangj@brocade.com> L: linux-scsi@vger.kernel.org @@ -1775,7 +1781,8 @@ F: include/linux/clk.h CISCO FCOE HBA DRIVER M: Abhijeet Joglekar <abjoglek@cisco.com> -M: Joe Eykholt <jeykholt@cisco.com> +M: Venkata Siva Vijayendra Bhamidipati <vbhamidi@cisco.com> +M: Brian Uchino <buchino@cisco.com> L: linux-scsi@vger.kernel.org S: Supported F: drivers/scsi/fnic/ |