Module Name:	syssrc
Committed By:	jhawk
Date:		Sat Jul  8 02:47:04 UTC 2000

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

Log Message:
Pullup rev 1.233 - rev 1.358 of GENERIC to CARDBUS, and merge conflicts.
Add GENERIC rev in "from:" line to aid future merging.
Major highlights include COMPAT_14, COMPAT_AOUT, NTFS, OVERLAY,
SOFTDEP, INET6, IPSEC, pcic iosiz changes, cz, dpt, rtk (cardbus!),
awi, cnw, ray, wi, xi, joy, and gif.


To generate a diff of this commit:
cvs rdiff -r1.15 -r1.16 syssrc/sys/arch/i386/conf/CARDBUS

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