Module Name:	syssrc
Committed By:	jhawk
Date:		Sat Jul  8 03:24:37 UTC 2000

Modified Files:
	syssrc/sys/arch/i386/conf: IOPENER

Log Message:
Pullover rev 1.320 - rev 1.358 of GENERIC to IOPENER, and merge conflicts.
Add GENERIC rev in "from:" line to aid in future merging.
Major highlights include SOFTDEP, and, err, 4 blank lines.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 syssrc/sys/arch/i386/conf/IOPENER

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.