diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-05 10:16:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-05 10:16:11 -0700 |
| commit | ef0a59924a795ccb4ced0ae1722a337745a1b045 (patch) | |
| tree | dddd5b2cccf2fe0d8ec27c68659e027d3e9a4064 /Makefile | |
| parent | 7b6ea43d3f90ba1db87883126c2c09777f51d3d6 (diff) | |
| parent | 2c2d831c81ec75a7b0d8e28caa8e3d9c1fe546f9 (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 a set of two small fixes, both to code which went in during
the merge window: cxgb4i has a scheduling in atomic bug in its new
ipv6 code and uas fails to work properly with the new scsi-mq code"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
[SCSI] uas: disable use of blk-mq I/O path
[SCSI] cxgb4i: avoid holding mutex in interrupt context
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions