tree 21d05aee3942fafcf3fe8931bdd05185c6e7eec1
parent 976d167615b64e14bc1491ca51d424e2ba9a5e84
parent a73914c35b05d80f8ce78288e10056c91090b666
author Linus Torvalds <torvalds@linux-foundation.org> 1317831371 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317831371 -0700

Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6

* 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