From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Oct 2014 17:16:11 +0000 (-0700)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v3.17~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ef0a59924a795ccb4ced0ae1722a337745a1b045;p=users%2Fjedix%2Flinux-maple.git

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
---

ef0a59924a795ccb4ced0ae1722a337745a1b045