Date: Fri, 6 Sep 1996 10:02:44 -0700 (PDT) From: Peter Wemm <peter> To: freebsd-smp Subject: cvs commit: sys/i386/conf files.i386 sys/scsi sd.c sys/sys kernel.h proc.h sys/i386/i386 db_interface.c exception.s machdep.c trap.c sys/kern init_main.c kern_exit.c kern_fork.c kern_shutdown.c kern_synch.c subr_prf.c vfs_bio.c Message-ID: <199609061702.KAA13040@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 96/09/06 10:02:42
Modified: i386/conf files.i386
i386/i386 db_interface.c exception.s machdep.c trap.c
kern init_main.c kern_exit.c kern_fork.c
kern_shutdown.c kern_synch.c subr_prf.c vfs_bio.c
scsi sd.c
sys kernel.h proc.h
Log:
Resolve merge conflicts
Revision Changes Path
1.6 +2 -1 sys/i386/conf/files.i386
1.4 +64 -87 sys/i386/i386/db_interface.c
1.10 +3 -1 sys/i386/i386/exception.s
1.21 +65 -173 sys/i386/i386/machdep.c
1.12 +4 -3 sys/i386/i386/trap.c
1.20 +2 -17 sys/kern/init_main.c
1.6 +82 -1 sys/kern/kern_exit.c
1.7 +81 -3 sys/kern/kern_fork.c
1.2 +4 -0 sys/kern/kern_shutdown.c
1.9 +3 -3 sys/kern/kern_synch.c
1.8 +3 -62 sys/kern/subr_prf.c
1.8 +33 -3 sys/kern/vfs_bio.c
1.6 +4 -1 sys/scsi/sd.c
1.7 +5 -4 sys/sys/kernel.h
1.11 +4 -1 sys/sys/proc.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199609061702.KAA13040>