diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /Documentation/scsi/NinjaSCSI.txt | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'Documentation/scsi/NinjaSCSI.txt')
| -rw-r--r-- | Documentation/scsi/NinjaSCSI.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/scsi/NinjaSCSI.txt b/Documentation/scsi/NinjaSCSI.txt index 3229b64cf24e..ac8db8ceec77 100644 --- a/Documentation/scsi/NinjaSCSI.txt +++ b/Documentation/scsi/NinjaSCSI.txt | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | 1. Comment | 4 | 1. Comment |
| 5 | This is Workbit corp.'s(http://www.workbit.co.jp/) NinjaSCSI-3 | 5 | This is Workbit corp.'s(http://www.workbit.co.jp/) NinjaSCSI-3 |
| 6 | (http://www.workbit.co.jp/ts/z_nj3r.html) and NinjaSCSI-32Bi | ||
| 7 | (http://www.workbit.co.jp/ts/z_njsc32bi.html) PCMCIA card driver module | ||
| 8 | for Linux. | 6 | for Linux. |
| 9 | 7 | ||
| 10 | 2. My Linux environment | 8 | 2. My Linux environment |