Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Jan 2015 19:59:25 +0000 (11:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Jan 2015 19:59:25 +0000 (11:59 -0800)
commitaff8ad59fee4b79f2986b1bccb942bed94fd43fa
tree719e825864772bc0db710c0e9986d39bd9caf307
parenteb74926920cfa756087a82e0b081df837177cb95
parent975f7d467480a11864d71a10dee908b83c5e682b
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