tree 91e5f0d291dad59b096051b48a3b927b7c2e5c75
parent 5b1017404aea6d2e552e991b3fd814d839e9cd67
parent 5ce7868e159a3ee4ddf95f8522643991fea97cf2
author Linus Torvalds <torvalds@linux-foundation.org> 1236037319 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1236037319 -0800

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] mpt: fix disable lsi sas to use msi as default
  [SCSI] fix ABORTED_COMMAND looping forever problem
  [SCSI] sd: revive sd_index_lock
  [SCSI] cxgb3i: update the driver version to 1.0.1
  [SCSI] cxgb3i: Fix spelling errors in documentation
  [SCSI] cxgb3i: added missing include in cxgb3i_ddp.h
  [SCSI] cxgb3i: Outgoing pdus need to observe skb's MAX_SKB_FRAGS
  [SCSI] cxgb3i: added per-task data to track transmit progress
  [SCSI] cxgb3i: transmit work-request fixes
  [SCSI] hptiop: Add new PCI device ID