diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /Documentation/scsi/aacraid.txt | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'Documentation/scsi/aacraid.txt')
| -rw-r--r-- | Documentation/scsi/aacraid.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt index 820fd0793502..be55670851a4 100644 --- a/Documentation/scsi/aacraid.txt +++ b/Documentation/scsi/aacraid.txt | |||
| @@ -24,10 +24,10 @@ Supported Cards/Chipsets | |||
| 24 | 9005:0285:9005:0296 Adaptec 2240S (SabreExpress) | 24 | 9005:0285:9005:0296 Adaptec 2240S (SabreExpress) |
| 25 | 9005:0285:9005:0290 Adaptec 2410SA (Jaguar) | 25 | 9005:0285:9005:0290 Adaptec 2410SA (Jaguar) |
| 26 | 9005:0285:9005:0293 Adaptec 21610SA (Corsair-16) | 26 | 9005:0285:9005:0293 Adaptec 21610SA (Corsair-16) |
| 27 | 9005:0285:103c:3227 Adaptec 2610SA (Bearcat) | 27 | 9005:0285:103c:3227 Adaptec 2610SA (Bearcat HP release) |
| 28 | 9005:0285:9005:0292 Adaptec 2810SA (Corsair-8) | 28 | 9005:0285:9005:0292 Adaptec 2810SA (Corsair-8) |
| 29 | 9005:0285:9005:0294 Adaptec Prowler | 29 | 9005:0285:9005:0294 Adaptec Prowler |
| 30 | 9005:0286:9005:029d Adaptec 2420SA (Intruder) | 30 | 9005:0286:9005:029d Adaptec 2420SA (Intruder HP release) |
| 31 | 9005:0286:9005:029c Adaptec 2620SA (Intruder) | 31 | 9005:0286:9005:029c Adaptec 2620SA (Intruder) |
| 32 | 9005:0286:9005:029b Adaptec 2820SA (Intruder) | 32 | 9005:0286:9005:029b Adaptec 2820SA (Intruder) |
| 33 | 9005:0286:9005:02a7 Adaptec 2830SA (Skyray) | 33 | 9005:0286:9005:02a7 Adaptec 2830SA (Skyray) |
| @@ -38,7 +38,7 @@ Supported Cards/Chipsets | |||
| 38 | 9005:0285:9005:0297 Adaptec 4005SAS (AvonPark) | 38 | 9005:0285:9005:0297 Adaptec 4005SAS (AvonPark) |
| 39 | 9005:0285:9005:0299 Adaptec 4800SAS (Marauder-X) | 39 | 9005:0285:9005:0299 Adaptec 4800SAS (Marauder-X) |
| 40 | 9005:0285:9005:029a Adaptec 4805SAS (Marauder-E) | 40 | 9005:0285:9005:029a Adaptec 4805SAS (Marauder-E) |
| 41 | 9005:0286:9005:02a2 Adaptec 4810SAS (Hurricane) | 41 | 9005:0286:9005:02a2 Adaptec 3800SAS (Hurricane44) |
| 42 | 1011:0046:9005:0364 Adaptec 5400S (Mustang) | 42 | 1011:0046:9005:0364 Adaptec 5400S (Mustang) |
| 43 | 1011:0046:9005:0365 Adaptec 5400S (Mustang) | 43 | 1011:0046:9005:0365 Adaptec 5400S (Mustang) |
| 44 | 9005:0283:9005:0283 Adaptec Catapult (3210S with arc firmware) | 44 | 9005:0283:9005:0283 Adaptec Catapult (3210S with arc firmware) |
| @@ -72,7 +72,7 @@ Supported Cards/Chipsets | |||
| 72 | 9005:0286:9005:02a1 ICP ICP9087MA (Lancer) | 72 | 9005:0286:9005:02a1 ICP ICP9087MA (Lancer) |
| 73 | 9005:0286:9005:02a4 ICP ICP9085LI (Marauder-X) | 73 | 9005:0286:9005:02a4 ICP ICP9085LI (Marauder-X) |
| 74 | 9005:0286:9005:02a5 ICP ICP5085BR (Marauder-E) | 74 | 9005:0286:9005:02a5 ICP ICP5085BR (Marauder-E) |
| 75 | 9005:0286:9005:02a3 ICP ICP5085AU (Hurricane) | 75 | 9005:0286:9005:02a3 ICP ICP5445AU (Hurricane44) |
| 76 | 9005:0286:9005:02a6 ICP ICP9067MA (Intruder-6) | 76 | 9005:0286:9005:02a6 ICP ICP9067MA (Intruder-6) |
| 77 | 9005:0286:9005:02a9 ICP ICP5087AU (Skyray) | 77 | 9005:0286:9005:02a9 ICP ICP5087AU (Skyray) |
| 78 | 9005:0286:9005:02aa ICP ICP5047AU (Skyray) | 78 | 9005:0286:9005:02aa ICP ICP5047AU (Skyray) |