Module Name:	syssrc
Committed By:	scottr
Date:		Tue Nov  9 01:44:22 UTC 1999

Modified Files:
	syssrc/sys/arch/mac68k/conf [scottr-mac68k-wscons]: GENERIC
	syssrc/sys/arch/mac68k/dev [scottr-mac68k-wscons]: adb.c adb_direct.c
	    adbsys.c aed.c pm_direct.c
	syssrc/sys/arch/mac68k/include [scottr-mac68k-wscons]: intr.h
	syssrc/sys/arch/mac68k/mac68k [scottr-mac68k-wscons]: autoconf.c
	    clock.c conf.c intr.c locore.s

Log Message:
Sync with main branch.


To generate a diff of this commit:
cvs rdiff -r1.85.2.6 -r1.85.2.7 syssrc/sys/arch/mac68k/conf/GENERIC
cvs rdiff -r1.27.2.1 -r1.27.2.2 syssrc/sys/arch/mac68k/dev/adb.c
cvs rdiff -r1.20.2.3 -r1.20.2.4 syssrc/sys/arch/mac68k/dev/adb_direct.c
cvs rdiff -r1.40 -r1.40.2.1 syssrc/sys/arch/mac68k/dev/adbsys.c
cvs rdiff -r1.7.2.2 -r1.7.2.3 syssrc/sys/arch/mac68k/dev/aed.c
cvs rdiff -r1.8.2.2 -r1.8.2.3 syssrc/sys/arch/mac68k/dev/pm_direct.c
cvs rdiff -r1.13.2.1 -r1.13.2.2 syssrc/sys/arch/mac68k/include/intr.h
cvs rdiff -r1.50.2.2 -r1.50.2.3 syssrc/sys/arch/mac68k/mac68k/autoconf.c
cvs rdiff -r1.36.10.3 -r1.36.10.4 syssrc/sys/arch/mac68k/mac68k/clock.c
cvs rdiff -r1.49.2.5 -r1.49.2.6 syssrc/sys/arch/mac68k/mac68k/conf.c
cvs rdiff -r1.3.2.2 -r1.3.2.3 syssrc/sys/arch/mac68k/mac68k/intr.c
cvs rdiff -r1.111.2.5 -r1.111.2.6 syssrc/sys/arch/mac68k/mac68k/locore.s

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