| commit | e3fb7d4cc0ef05e9894e717dedb154edb1021b1a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 04 14:31:51 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 04 14:31:51 2014 -0700 |
| tree | 4a1542293ea5acc022206be637530363c4611d93 | |
| parent | 0384dcae2b18db80c49117ac57ea15211ca48751 [diff] | |
| parent | 0c8482ac92db5ac15792caf23b7f7df9e4f48ae1 [diff] |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/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.