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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (74 commits)
  [SCSI] sg: fix q->queue_lock on scsi_error_handler path
  [SCSI] replace __inline with inline
  [SCSI] a2091: make 2 functions static
  [SCSI] a3000: make 2 functions static
  [SCSI] ses: #if 0 the unused ses_match_host()
  [SCSI] use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  [SCSI] sg: fix iovec bugs introduced by the block layer conversion
  [SCSI] qlogicpti: use request_firmware
  [SCSI] advansys: use request_firmware
  [SCSI] qla1280: use request_firmware
  [SCSI] libiscsi: fix iscsi pool error path
  [SCSI] cxgb3i: call ddp release function directly
  [SCSI] cxgb3i: merge cxgb3i_ddp into cxgb3i module
  [SCSI] cxgb3i: close all tcp connections upon chip reset
  [SCSI] cxgb3i: re-read ddp settings information after chip reset
  [SCSI] cxgb3i: re-initialize ddp settings after chip reset
  [SCSI] cxgb3i: subscribe to error notification from cxgb3 driver
  [SCSI] aacraid driver update
  [SCSI] mptsas: remove unneeded check
  [SCSI] config: Make need for SCSI_CDROM clearer
  ...

1 files changed, 4 insertions, 11 deletions

diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt
index ddace3afc83b..30f643f611b2 100644
--- a/Documentation/scsi/aacraid.txt
+++ b/Documentation/scsi/aacraid.txt
@@ -60,17 +60,9 @@ Supported Cards/Chipsets
         9005:0285:9005:02d5     Adaptec ASR-2405 (Voodoo40 Lite)
         9005:0285:9005:02d6     Adaptec ASR-2445 (Voodoo44 Lite)
         9005:0285:9005:02d7     Adaptec ASR-2805 (Voodoo80 Lite)
-        9005:0285:9005:02d8     Adaptec 5405G (Voodoo40 PM)
-        9005:0285:9005:02d9     Adaptec 5445G (Voodoo44 PM)
-        9005:0285:9005:02da     Adaptec 5805G (Voodoo80 PM)
-        9005:0285:9005:02db     Adaptec 5085G (Voodoo08 PM)
-        9005:0285:9005:02dc     Adaptec 51245G (Voodoo124 PM)
-        9005:0285:9005:02dd     Adaptec 51645G (Voodoo164 PM)
-        9005:0285:9005:02de     Adaptec 52445G (Voodoo244 PM)
-        9005:0285:9005:02df     Adaptec ASR-2045G (Voodoo04 Lite PM)
-        9005:0285:9005:02e0     Adaptec ASR-2405G (Voodoo40 Lite PM)
-        9005:0285:9005:02e1     Adaptec ASR-2445G (Voodoo44 Lite PM)
-        9005:0285:9005:02e2     Adaptec ASR-2805G (Voodoo80 Lite PM)
+        9005:0285:9005:02d8     Adaptec 5405Z (Voodoo40 BLBU)
+        9005:0285:9005:02d9     Adaptec 5445Z (Voodoo44 BLBU)
+        9005:0285:9005:02da     Adaptec 5805Z (Voodoo80 BLBU)
         1011:0046:9005:0364     Adaptec 5400S (Mustang)
         1011:0046:9005:0365     Adaptec 5400S (Mustang)
         9005:0287:9005:0800     Adaptec Themisto (Jupiter)
@@ -140,6 +132,7 @@ Deanna Bonds                            (non-DASD support, PAE fibs and 64 bit,
                                          where fibs that go to the hardware are consistently called hw_fibs and
                                          not just fibs like the name of the driver tracking structure)
 Mark Salyzyn <Mark_Salyzyn@adaptec.com> Fixed panic issues and added some new product ids for upcoming hbas. Performance tuning, card failover and bug mitigations.
+Achim Leubner <Achim_Leubner@adaptec.com>
 
 Original Driver
 -------------------------