summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-shark/time.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge with Linux 2.4.0-test9. Please check DECstation, I had a numberRalf Baechle2000-10-051-10/+3
| | | | | | | 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.4.0-test1-ac21 + pile of MIPS cleanups to make mergingRalf Baechle2000-06-191-10/+1
| | | | | possible. Chainsawed RM200 kernel to compile again. Jazz machine status unknown.
* Merge with Linux 2.3.99-pre4.Ralf Baechle2000-04-191-0/+101