diff options
author | 2014-05-04 14:31:51 -0700 | |
---|---|---|
committer | 2014-05-04 14:31:51 -0700 | |
commit | e3fb7d4cc0ef05e9894e717dedb154edb1021b1a (patch) | |
tree | 4a1542293ea5acc022206be637530363c4611d93 /tools/perf/scripts/python/check-perf-trace.py | |
parent | Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | [SCSI] virtio-scsi: Skip setting affinity on uninitialized vq (diff) | |
download | linux-dev-e3fb7d4cc0ef05e9894e717dedb154edb1021b1a.tar.xz linux-dev-e3fb7d4cc0ef05e9894e717dedb154edb1021b1a.zip |
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.
Diffstat (limited to 'tools/perf/scripts/python/check-perf-trace.py')
0 files changed, 0 insertions, 0 deletions