diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-17 22:26:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-17 22:26:52 -0500 |
| commit | 901b2082b51d4f1c6deac5d5264a744b793ed46f (patch) | |
| tree | 427a29264d6e45e30ec4cf16aea0c9c196f914ca /drivers/spi/spi-altera.c | |
| parent | 298e320431db1db52b9ddd6f242bb33a4ea2d094 (diff) | |
| parent | 70a0f2c1898c6abf53670e55642b6e840b003892 (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 one fix for a Multiqueue sleeping in invalid context problem
and a MAINTAINER file update for Qlogic"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: ->queue_rq can't sleep
MAINTAINERS: Update maintainer list for qla4xxx
Diffstat (limited to 'drivers/spi/spi-altera.c')
0 files changed, 0 insertions, 0 deletions