Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / Documentation / scsi / aacraid.txt

diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt
index cc12b55..709ca99 100644 (file)
--- a/Documentation/scsi/aacraid.txt
+++ b/Documentation/scsi/aacraid.txt
@@ -38,10 +38,8 @@ Supported Cards/Chipsets
        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)
@@ -50,18 +48,41 @@ Supported Cards/Chipsets
        9005:0285:9005:02be     Adaptec 31605 (Marauder160)
        9005:0285:9005:02c3     Adaptec 51205 (Voodoo120)
        9005:0285:9005:02c4     Adaptec 51605 (Voodoo160)
+       9005:0285:15d9:02c9     SMC     AOC-USAS-S4iR
+       9005:0285:15d9:02ca     SMC     AOC-USAS-S8iR
        9005:0285:9005:02ce     Adaptec 51245 (Voodoo124)
        9005:0285:9005:02cf     Adaptec 51645 (Voodoo164)
        9005:0285:9005:02d0     Adaptec 52445 (Voodoo244)
+       9005:0285:9005:02d1     Adaptec 5405 (Voodoo40)
+       9005:0285:15d9:02d2     SMC     AOC-USAS-S8i-LP
+       9005:0285:15d9:02d3     SMC     AOC-USAS-S8iR-LP
+       9005:0285:9005:02d4     Adaptec ASR-2045 (Voodoo04 Lite)
+       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)
        1011:0046:9005:0364     Adaptec 5400S (Mustang)
+       1011:0046:9005:0365     Adaptec 5400S (Mustang)
        9005:0287:9005:0800     Adaptec Themisto (Jupiter)
        9005:0200:9005:0200     Adaptec Themisto (Jupiter)
        9005:0286:9005:0800     Adaptec Callisto (Jupiter)
        1011:0046:9005:1364     Dell    PERC 2/QC (Quad Channel, Mustang)
+       1011:0046:9005:1365     Dell    PERC 2/QC (Quad Channel, Mustang)
        1028:0001:1028:0001     Dell    PERC 2/Si (Iguana)
        1028:0003:1028:0003     Dell    PERC 3/Si (SlimFast)
        1028:0002:1028:0002     Dell    PERC 3/Di (Opal)
-       1028:0004:1028:0004     Dell    PERC 3/DiF (Iguana)
+       1028:0004:1028:0004     Dell    PERC 3/SiF (Iguana)
+       1028:0004:1028:00d0     Dell    PERC 3/DiF (Iguana)
        1028:0002:1028:00d1     Dell    PERC 3/DiV (Viper)
        1028:0002:1028:00d9     Dell    PERC 3/DiL (Lexus)
        1028:000a:1028:0106     Dell    PERC 3/DiJ (Jaguar)
@@ -103,6 +124,7 @@ Supported Cards/Chipsets
        9005:0285:108e:7aac     SUN     STK RAID REM (Voodoo44 Coyote)
        9005:0285:108e:0286     SUN     STK RAID INT (Cougar)
        9005:0285:108e:0287     SUN     STK RAID EXT (Prometheus)
+       9005:0285:108e:7aae     SUN     STK RAID EM (Narvi)
 
 People
 -------------------------