Date: Fri, 24 May 1996 15:40:48 -0700 (PDT) From: Peter Wemm <peter> To: freebsd-smp Subject: cvs commit: sys/i386/i386 locore.s machdep.c pmap.c trap.c sys/i386/conf options.i386 sys/kern subr_prf.c vfs_bio.c sys/vm vm_glue.c Message-ID: <199605242240.PAA12390@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 96/05/24 15:40:47
Modified: i386/conf options.i386
i386/i386 locore.s machdep.c pmap.c trap.c
kern subr_prf.c vfs_bio.c
vm vm_glue.c
Log:
Merge the -current changes onto the mainline.
Grrr. many of these conflicts were resulting from trivial things like
whitespace...
Revision Changes Path
1.4 +5 -2 sys/i386/conf/options.i386
1.20 +3 -1 sys/i386/i386/locore.s
1.16 +11 -2 sys/i386/i386/machdep.c
1.14 +842 -613 sys/i386/i386/pmap.c
1.9 +1 -15 sys/i386/i386/trap.c
1.7 +6 -4 sys/kern/subr_prf.c
1.4 +13 -13 sys/kern/vfs_bio.c
1.5 +30 -74 sys/vm/vm_glue.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199605242240.PAA12390>