Commit e6f194d8f6f50da6837af637b2fd839c34185f7a
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: (60 commits) [SCSI] libsas: make ATA functions selectable by a config option [SCSI] bsg: unexport sg v3 helper functions [SCSI] bsg: fix bsg_unregister_queue [SCSI] bsg: make class backlinks [SCSI] 3w-9xxx: add support for 9690SA [SCSI] bsg: fix bsg_register_queue error path [SCSI] ESP: Increase ESP_BUS_TIMEOUT to 275. [SCSI] libsas: fix scr_read/write users and update the libata documentation [SCSI] mpt fusion: update Kconfig help [SCSI] scsi_transport_sas: add destructor for bsg [SCSI] iscsi_tcp: buggered kmalloc() [SCSI] qla2xxx: Update version number to 8.02.00-k2. [SCSI] qla2xxx: Add ISP25XX support. [SCSI] qla2xxx: Use pci_try_set_mwi(). [SCSI] qla2xxx: Use PCI-X/PCI-Express read control interfaces. [SCSI] qla2xxx: Re-factor isp_operations to static structures. [SCSI] qla2xxx: Validate mid-layer 'underflow' during check-condition handling. [SCSI] qla2xxx: Correct setting of 'current' and 'supported' speeds during FDMI registration. [SCSI] qla2xxx: Generalize iIDMA support. [SCSI] qla2xxx: Generalize FW-Interface-2 support. ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 73 changed files Side-by-side Diff
- Documentation/DocBook/libata.tmpl
- block/Kconfig
- block/bsg.c
- block/scsi_ioctl.c
- drivers/firewire/fw-sbp2.c
- drivers/message/fusion/Kconfig
- drivers/message/fusion/mptbase.c
- drivers/message/fusion/mptbase.h
- drivers/message/fusion/mptfc.c
- drivers/message/fusion/mptsas.c
- drivers/message/fusion/mptscsih.c
- drivers/message/fusion/mptscsih.h
- drivers/message/fusion/mptspi.c
- drivers/s390/scsi/zfcp_aux.c
- drivers/s390/scsi/zfcp_def.h
- drivers/s390/scsi/zfcp_erp.c
- drivers/s390/scsi/zfcp_fsf.c
- drivers/s390/scsi/zfcp_qdio.c
- drivers/scsi/3w-9xxx.c
- drivers/scsi/3w-9xxx.h
- drivers/scsi/Kconfig
- drivers/scsi/a4000t.c
- drivers/scsi/aacraid/aachba.c
- drivers/scsi/aacraid/aacraid.h
- drivers/scsi/aacraid/commsup.c
- drivers/scsi/aic94xx/aic94xx_dev.c
- drivers/scsi/aic94xx/aic94xx_init.c
- drivers/scsi/aic94xx/aic94xx_task.c
- drivers/scsi/bvme6000_scsi.c
- drivers/scsi/esp_scsi.h
- drivers/scsi/libsas/Kconfig
- drivers/scsi/libsas/Makefile
- drivers/scsi/libsas/sas_ata.c
- drivers/scsi/libsas/sas_discover.c
- drivers/scsi/libsas/sas_expander.c
- drivers/scsi/libsas/sas_init.c
- drivers/scsi/libsas/sas_internal.h
- drivers/scsi/libsas/sas_scsi_host.c
- drivers/scsi/mvme16x_scsi.c
- drivers/scsi/pcmcia/Kconfig
- drivers/scsi/qla2xxx/qla_attr.c
- drivers/scsi/qla2xxx/qla_dbg.c
- drivers/scsi/qla2xxx/qla_dbg.h
- drivers/scsi/qla2xxx/qla_def.h
- drivers/scsi/qla2xxx/qla_fw.h
- drivers/scsi/qla2xxx/qla_gbl.h
- drivers/scsi/qla2xxx/qla_gs.c
- drivers/scsi/qla2xxx/qla_init.c
- drivers/scsi/qla2xxx/qla_inline.h
- drivers/scsi/qla2xxx/qla_iocb.c
- drivers/scsi/qla2xxx/qla_isr.c
- drivers/scsi/qla2xxx/qla_mbx.c
- drivers/scsi/qla2xxx/qla_os.c
- drivers/scsi/qla2xxx/qla_sup.c
- drivers/scsi/qla2xxx/qla_version.h
- drivers/scsi/scsi_debug.c
- drivers/scsi/scsi_sysctl.c
- drivers/scsi/scsi_sysfs.c
- drivers/scsi/scsi_transport_fc.c
- drivers/scsi/scsi_transport_sas.c
- drivers/scsi/seagate.c
- drivers/scsi/sim710.c
- drivers/scsi/sr.c
- drivers/scsi/wd33c93.c
- drivers/scsi/zorro7xx.c
- include/linux/blkdev.h
- include/linux/bsg.h
- include/linux/libata.h
- include/linux/pci_ids.h
- include/scsi/libsas.h
- include/scsi/sas_ata.h
- include/scsi/scsi_host.h
- include/scsi/scsi_transport_sas.h