Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Apr 2006 00:09:08 +0000 (17:09 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Apr 2006 00:09:08 +0000 (17:09 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (679 commits)
  commit 7676f83aeb774e7a3abe6af06ec92b29488b5b79
  Author: James Bottomley <James.Bottomley@steeleye.com>
  Date:   Fri Apr 14 09:47:59 2006 -0500

      [SCSI] scsi_transport_sas: don't scan a non-existent end device

      Any end device that can't support any of the scanning protocols
      shouldn't be scanned, so set its id to -1 to prevent
      scsi_scan_target() being called for it.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
  commit 3c0c25b97c7d020ef07f6366cf1d668a8e980c7c
  Author: Moore, Eric <Eric.Moore@lsil.com>
  Date:   Thu Apr 13 16:08:17 2006 -0600

      [SCSI] mptfusion - fix panic in mptsas_slave_configure

      Driver panic when RAID logical volume was present when driver
      loaded, or when a RAID logical volume was created on the fly.
  ...


Trivial merge