Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits) [SCSI] 53c700: remove reliance on deprecated cmnd fields [SCSI] hptiop: don't use cmnd->bufflen [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver [SCSI] aacraid: small misc. cleanups [SCSI] aacraid: Update supported product information [SCSI] aacraid: Fix return code interpretation [SCSI] scsi_transport_sas: fix panic in sas_free_rphy [SCSI] remove RQ_SCSI_* flags [SCSI] remove scsi_request infrastructure [SCSI] mptfusion: change driver revision to 3.03.10 [SCSI] mptfc: abort of board reset leaves port dead requiring reboot [SCSI] mptfc: fix fibre channel infinite request/response loop [SCSI] mptfc: set fibre channel fw target missing timers to one second [SCSI] mptfusion: move fc event/reset handling to mptfc [SCSI] spi transport: don't allow dt to be set on SE or HVD buses [SCSI] aic7xxx: expose the bus setting to sysfs [SCSI] scsi: remove Documentation/scsi/cpqfc.txt [SCSI] drivers/scsi: Use ARRAY_SIZE macro [SCSI] Remove last page_address from dc395x.c [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver ... Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to the sparc interrupt cleanups)
No related branches found
No related tags found
Showing
- Documentation/scsi/00-INDEX 0 additions, 2 deletionsDocumentation/scsi/00-INDEX
- Documentation/scsi/ChangeLog.megaraid_sas 13 additions, 0 deletionsDocumentation/scsi/ChangeLog.megaraid_sas
- Documentation/scsi/aacraid.txt 4 additions, 4 deletionsDocumentation/scsi/aacraid.txt
- Documentation/scsi/cpqfc.txt 0 additions, 272 deletionsDocumentation/scsi/cpqfc.txt
- Documentation/scsi/hptiop.txt 92 additions, 0 deletionsDocumentation/scsi/hptiop.txt
- MAINTAINERS 6 additions, 0 deletionsMAINTAINERS
- drivers/block/DAC960.c 7 additions, 6 deletionsdrivers/block/DAC960.c
- drivers/block/cciss_scsi.c 3 additions, 3 deletionsdrivers/block/cciss_scsi.c
- drivers/message/fusion/mptbase.c 53 additions, 156 deletionsdrivers/message/fusion/mptbase.c
- drivers/message/fusion/mptbase.h 13 additions, 3 deletionsdrivers/message/fusion/mptbase.h
- drivers/message/fusion/mptfc.c 380 additions, 14 deletionsdrivers/message/fusion/mptfc.c
- drivers/message/fusion/mptscsih.c 1 addition, 22 deletionsdrivers/message/fusion/mptscsih.c
- drivers/message/i2o/i2o_scsi.c 2 additions, 2 deletionsdrivers/message/i2o/i2o_scsi.c
- drivers/s390/scsi/zfcp_aux.c 50 additions, 41 deletionsdrivers/s390/scsi/zfcp_aux.c
- drivers/s390/scsi/zfcp_ccw.c 3 additions, 11 deletionsdrivers/s390/scsi/zfcp_ccw.c
- drivers/s390/scsi/zfcp_dbf.c 3 additions, 7 deletionsdrivers/s390/scsi/zfcp_dbf.c
- drivers/s390/scsi/zfcp_def.h 12 additions, 56 deletionsdrivers/s390/scsi/zfcp_def.h
- drivers/s390/scsi/zfcp_erp.c 33 additions, 242 deletionsdrivers/s390/scsi/zfcp_erp.c
- drivers/s390/scsi/zfcp_ext.h 4 additions, 15 deletionsdrivers/s390/scsi/zfcp_ext.h
- drivers/s390/scsi/zfcp_fsf.c 59 additions, 83 deletionsdrivers/s390/scsi/zfcp_fsf.c
Loading
Please register or sign in to comment