summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-05 19:16:11 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-05 19:16:11 +0200
commitef0a59924a795ccb4ced0ae1722a337745a1b045 (patch)
treedddd5b2cccf2fe0d8ec27c68659e027d3e9a4064 /drivers/net
parentMerge tag 'tiny/kconfig-for-3.17' of https://git.kernel.org/pub/scm/linux/ker... (diff)
parent[SCSI] uas: disable use of blk-mq I/O path (diff)
downloadlinux-ef0a59924a795ccb4ced0ae1722a337745a1b045.tar.xz
linux-ef0a59924a795ccb4ced0ae1722a337745a1b045.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 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 'drivers/net')
0 files changed, 0 insertions, 0 deletions