Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Oct 2011 16:16:11 +0000 (09:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Oct 2011 16:16:11 +0000 (09:16 -0700)
* git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6:
  [SCSI] libsas: fix panic when single phy is disabled on a wide port
  [SCSI] qla2xxx: Fix crash in qla2x00_abort_all_cmds() on unload


Trivial merge