diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /Documentation/cciss.txt | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'Documentation/cciss.txt')
| -rw-r--r-- | Documentation/cciss.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt index 8244c6442faa..89698e8df7d4 100644 --- a/Documentation/cciss.txt +++ b/Documentation/cciss.txt | |||
| @@ -21,11 +21,14 @@ This driver is known to work with the following cards: | |||
| 21 | * SA E200 | 21 | * SA E200 |
| 22 | * SA E200i | 22 | * SA E200i |
| 23 | * SA E500 | 23 | * SA E500 |
| 24 | * SA P700m | ||
| 24 | * SA P212 | 25 | * SA P212 |
| 25 | * SA P410 | 26 | * SA P410 |
| 26 | * SA P410i | 27 | * SA P410i |
| 27 | * SA P411 | 28 | * SA P411 |
| 28 | * SA P812 | 29 | * SA P812 |
| 30 | * SA P712m | ||
| 31 | * SA P711m | ||
| 29 | 32 | ||
| 30 | Detecting drive failures: | 33 | Detecting drive failures: |
| 31 | ------------------------- | 34 | ------------------------- |