• Linus Torvalds's avatar
    Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · a4326635
    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] megaraid_sas: intercept cmd timeout and throttle io
      [SCSI] fusion: Fix |/|| confusion
      [SCSI] aic94xx: asd_clear_nexus should fail if the cleared task does not complete
      [SCSI] aic7xxx: fix aicasm build failure with gcc-3.4.6
      [SCSI] aacraid: apply commit config for reset_devices flag
      [SCSI] sd: fix refcounting regression in suspend/resume routines
      [SCSI] aacraid: fix panic on short Inquiry
      [SCSI] aacraid: Correct sa platform support. (Was: [Bug 8469] Bad EIP value on pentium3 SMP kernel-
      [SCSI] NCR53C9x: correct spelling mistake in deprecation notice
      [SCSI] tgt: fix a rdma indirect transfer error bug
      [SCSI] MegaRAID: Update MAINTAINERS email-id
      [SCSI] stex: minor cleanup and version update
      [SCSI] stex: fix reset recovery for console device
      [SCSI] stex: extend hard reset wait time
      [SCSI] stex: fix id mapping issue
      [SCSI] ipr: Proper return codes for eh_dev_reset for SATA devices
      [SCSI] zfcp: IO stall after deleting and path checker changes after reenabling zfcp devices
      [SCSI] zfcp: avoid clutter in erp_dbf