summaryrefslogtreecommitdiffstats
path: root/include/linux/if_pppox.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge with Linux 2.4.0-test9. Please check DECstation, I had a numberRalf Baechle2000-10-051-1/+1
| | | | | | | 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.99-pre9.Ralf Baechle2000-06-151-2/+3
|
* Merge with Linux 2.3.99-pre7 and various other bits.Ralf Baechle2000-05-121-0/+136