source-changes: CVS commit: [nathanw_sa] src/sys/arch/sparc/sparc

Subject: CVS commit: [nathanw_sa] src/sys/arch/sparc/sparc
To: None <source-changes@netbsd.org>
From: Martin Husemann <martin@netbsd.org>
List: source-changes
Date: 01/16/2003 15:07:02

Module Name:	src
Committed By:	martin
Date:		Thu Jan 16 13:07:02 UTC 2003

Modified Files:
	src/sys/arch/sparc/sparc [nathanw_sa]: trap.c vm_machdep.c

Log Message:
Fix merge botches.


To generate a diff of this commit:
cvs rdiff -r1.106.8.25 -r1.106.8.26 src/sys/arch/sparc/sparc/trap.c
cvs rdiff -r1.60.4.11 -r1.60.4.12 src/sys/arch/sparc/sparc/vm_machdep.c

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