summaryrefslogtreecommitdiffstats
path: root/drivers/block/ida_ioctl.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge with Linux 2.4.0-test9. Please check DECstation, I had a numberRalf Baechle2000-10-051-1/+8
| | | | | | | of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem.
* Merge with 2.3.10.Ralf Baechle1999-09-281-0/+83