Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Showing
- Documentation/scsi/00-INDEX 2 additions, 0 deletionsDocumentation/scsi/00-INDEX
- Documentation/scsi/scsi_eh.txt 479 additions, 0 deletionsDocumentation/scsi/scsi_eh.txt
- drivers/block/scsi_ioctl.c 1 addition, 0 deletionsdrivers/block/scsi_ioctl.c
- drivers/ieee1394/sbp2.c 4 additions, 4 deletionsdrivers/ieee1394/sbp2.c
- drivers/scsi/3w-9xxx.c 24 additions, 6 deletionsdrivers/scsi/3w-9xxx.c
- drivers/scsi/Kconfig 7 additions, 0 deletionsdrivers/scsi/Kconfig
- drivers/scsi/Makefile 1 addition, 0 deletionsdrivers/scsi/Makefile
- drivers/scsi/lpfc/lpfc_attr.c 10 additions, 12 deletionsdrivers/scsi/lpfc/lpfc_attr.c
- drivers/scsi/lpfc/lpfc_hbadisc.c 2 additions, 5 deletionsdrivers/scsi/lpfc/lpfc_hbadisc.c
- drivers/scsi/lpfc/lpfc_hw.h 11 additions, 6 deletionsdrivers/scsi/lpfc/lpfc_hw.h
- drivers/scsi/lpfc/lpfc_init.c 2 additions, 5 deletionsdrivers/scsi/lpfc/lpfc_init.c
- drivers/scsi/qla2xxx/qla_attr.c 8 additions, 10 deletionsdrivers/scsi/qla2xxx/qla_attr.c
- drivers/scsi/qla2xxx/qla_init.c 2 additions, 2 deletionsdrivers/scsi/qla2xxx/qla_init.c
- drivers/scsi/scsi_lib.c 88 additions, 50 deletionsdrivers/scsi/scsi_lib.c
- drivers/scsi/scsi_priv.h 1 addition, 0 deletionsdrivers/scsi/scsi_priv.h
- drivers/scsi/scsi_scan.c 59 additions, 29 deletionsdrivers/scsi/scsi_scan.c
- drivers/scsi/scsi_sysfs.c 15 additions, 13 deletionsdrivers/scsi/scsi_sysfs.c
- drivers/scsi/scsi_transport_sas.c 820 additions, 0 deletionsdrivers/scsi/scsi_transport_sas.c
- drivers/scsi/sg.c 2 additions, 2 deletionsdrivers/scsi/sg.c
- include/scsi/scsi_device.h 2 additions, 2 deletionsinclude/scsi/scsi_device.h
Loading
Please register or sign in to comment