tree a2ea20b569632d59abad0f351e17824440805582
parent 3eb9c8be0cc56619571b675a688001f2ddb25c90
parent 2b69a8a2b6e5f5d26a038a6494a88a1a776ac88f
author Linus Torvalds <torvalds@linux-foundation.org> 1243111440 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243111440 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] mpt2sas: fix driver version inconsistency
  [SCSI] 3w-xxxx: scsi_dma_unmap fix
  [SCSI] 3w-9xxx: scsi_dma_unmap fix
  [SCSI] ses: fix problems caused by empty SES provided name
  [SCSI] fc-transport: Close state transition-window during rport deletion.
  [SCSI] initialize max_target_blocked in scsi_alloc_target
  [SCSI] fnic: Add new Cisco PCI-Express FCoE HBA