Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (87 commits)
  [SCSI] fusion: fix domain validation loops
  [SCSI] qla2xxx: fix regression on sparc64
  [SCSI] modalias for scsi devices
  [SCSI] sg: cap reserved_size values at max_sectors
  [SCSI] BusLogic: stop using check_region
  [SCSI] tgt: fix rdma transfer bugs
  [SCSI] aacraid: fix aacraid not finding device
  [SCSI] aacraid: Correct SMC products in aacraid.txt
  [SCSI] scsi_error.c: Add EH Start Unit retry
  [SCSI] aacraid: [Fastboot] Panics for AACRAID driver during 'insmod' for kexec test.
  [SCSI] ipr: Driver version to 2.3.2
  [SCSI] ipr: Faster sg list fetch
  [SCSI] ipr: Return better qc_issue errors
  [SCSI] ipr: Disrupt device error
  [SCSI] ipr: Improve async error logging level control
  [SCSI] ipr: PCI unblock config access fix
  [SCSI] ipr: Fix for oops following SATA request sense
  [SCSI] ipr: Log error for SAS dual path switch
  [SCSI] ipr: Enable logging of debug error data for all devices
  [SCSI] ipr: Add new PCI-E IDs to device table
  ...

2 files changed, 7 insertions, 5 deletions

diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt
index dc8e44fc650f..2368e7e4a8cf 100644
--- a/Documentation/scsi/aacraid.txt
+++ b/Documentation/scsi/aacraid.txt
@@ -37,7 +37,11 @@ Supported Cards/Chipsets
         9005:0286:9005:029d     Adaptec 2420SA (Intruder HP release)
         9005:0286:9005:02ac     Adaptec 1800 (Typhoon44)
         9005:0285:9005:02b5     Adaptec 5445 (Voodoo44)
+        9005:0285:15d9:02b5     SMC     AOC-USAS-S4i
+        9005:0285:15d9:02c9     SMC     AOC-USAS-S4iR
         9005:0285:9005:02b6     Adaptec 5805 (Voodoo80)
+        9005:0285:15d9:02b6     SMC     AOC-USAS-S8i
+        9005:0285:15d9:02ca     SMC     AOC-USAS-S8iR
         9005:0285:9005:02b7     Adaptec 5085 (Voodoo08)
         9005:0285:9005:02bb     Adaptec 3405 (Marauder40LP)
         9005:0285:9005:02bc     Adaptec 3805 (Marauder80LP)
@@ -93,6 +97,9 @@ Supported Cards/Chipsets
         9005:0286:9005:02ae             (Aurora Lite ARK)
         9005:0285:9005:02b0             (Sunrise Lake ARK)
         9005:0285:9005:02b1     Adaptec (Voodoo 8 internal 8 external)
+        9005:0285:108e:7aac     SUN     STK RAID REM (Voodoo44 Coyote)
+        9005:0285:108e:0286     SUN     SG-XPCIESAS-R-IN (Cougar)
+        9005:0285:108e:0287     SUN     SG-XPCIESAS-R-EX (Prometheus)
 
 People
 -------------------------
diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt
index caf10b155185..88ef88b949f7 100644
--- a/Documentation/scsi/ncr53c8xx.txt
+++ b/Documentation/scsi/ncr53c8xx.txt
@@ -562,11 +562,6 @@ if only one has a flaw for some SCSI feature, you can disable the
 support by the driver of this feature at linux start-up and enable
 this feature after boot-up only for devices that support it safely.
 
-CONFIG_SCSI_NCR53C8XX_PROFILE_SUPPORT  (default answer: n)
-    This option must be set for profiling information to be gathered 
-    and printed out through the proc file system. This features may 
-    impact performances.
-
 CONFIG_SCSI_NCR53C8XX_IOMAPPED       (default answer: n)
     Answer "y" if you suspect your mother board to not allow memory mapped I/O.
     May slow down performance a little.  This option is required by