Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 May 2014 21:31:51 +0000 (14:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 May 2014 21:31:51 +0000 (14:31 -0700)
commite3fb7d4cc0ef05e9894e717dedb154edb1021b1a
tree4a1542293ea5acc022206be637530363c4611d93
parent0384dcae2b18db80c49117ac57ea15211ca48751
parent0c8482ac92db5ac15792caf23b7f7df9e4f48ae1
Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "This is two patches both fixing bugs in drivers (virtio-scsi and
  mpt2sas) causing an oops in certain circumstances"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  [SCSI] virtio-scsi: Skip setting affinity on uninitialized vq
  [SCSI] mpt2sas: Don't disable device twice at suspend.