Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:39:32 +0000 (17:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:39:32 +0000 (17:39 -0700)
commita2c2df8672f55195f101d9251117aa59e358d296
tree72e7c3f035e890928624db5e08d77d697b8a872a
parent873b779d998fd70e17a3f2bff6a35f0e0a3b0f11
parentea80dadec7a06889562b478cf0b87afbe62b7ac8
Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "This is a couple of minor fixes, one for a preempt warning in the
  mpt2sas driver and one is a config failure with the new sd async
  domain."

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  [SCSI] Fix sd_probe_domain config problem
  [SCSI] mpt2sas: Fix unsafe using smp_processor_id() in preemptible