From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 10 Jan 2015 19:59:25 +0000 (-0800)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: MMI-PSA29.97-13-9~10847
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aff8ad59fee4b79f2986b1bccb942bed94fd43fa;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi

Pull SCSI fix from James Bottomley:
 "Just one fix: a qlogic busy wait regression"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  qla2xxx: fix busy wait regression
---

aff8ad59fee4b79f2986b1bccb942bed94fd43fa