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

Subject: CVS commit: [vmlocking] src/sys/arch
To: None <source-changes@NetBSD.org>
From: Andrew Doran <ad@netbsd.org>
List: source-changes
Date: 07/18/2007 10:42:56

Module Name:	src
Committed By:	ad
Date:		Wed Jul 18 10:42:55 UTC 2007

Modified Files:
	src/sys/arch/arm/arm [vmlocking]: idle_machdep.c
	src/sys/arch/hppa/hppa [vmlocking]: idle_machdep.c
	src/sys/arch/xen/i386 [vmlocking]: xen_intr.c

Log Message:
Fix merge errors.


To generate a diff of this commit:
cvs rdiff -r1.2.2.3 -r1.2.2.4 src/sys/arch/arm/arm/idle_machdep.c
cvs rdiff -r1.2.2.3 -r1.2.2.4 src/sys/arch/hppa/hppa/idle_machdep.c
cvs rdiff -r1.2.2.4 -r1.2.2.5 src/sys/arch/xen/i386/xen_intr.c

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