source-changes: CVS commit: [newlock2] src/sys/arch/i386/conf

Subject: CVS commit: [newlock2] src/sys/arch/i386/conf
To: None <source-changes@NetBSD.org>
From: Andrew Doran <ad@netbsd.org>
List: source-changes
Date: 02/06/2007 16:55:40

Module Name:	src
Committed By:	ad
Date:		Tue Feb  6 16:55:40 UTC 2007

Modified Files:
	src/sys/arch/i386/conf [newlock2]: DISKLESS GENERIC GENERIC.MPACPI
	    GENERIC_LAPTOP PARALLELS QEMU SWINGER VIRTUALPC

Log Message:
Fix merge errors.


To generate a diff of this commit:
cvs rdiff -r1.114.2.1 -r1.114.2.2 src/sys/arch/i386/conf/DISKLESS
cvs rdiff -r1.779.2.3 -r1.779.2.4 src/sys/arch/i386/conf/GENERIC
cvs rdiff -r1.59.4.1 -r1.59.4.2 src/sys/arch/i386/conf/GENERIC.MPACPI
cvs rdiff -r1.204.2.2 -r1.204.2.3 src/sys/arch/i386/conf/GENERIC_LAPTOP
cvs rdiff -r1.8.2.1 -r1.8.2.2 src/sys/arch/i386/conf/PARALLELS
cvs rdiff -r1.7.2.1 -r1.7.2.2 src/sys/arch/i386/conf/QEMU
cvs rdiff -r1.84.2.1 -r1.84.2.2 src/sys/arch/i386/conf/SWINGER
cvs rdiff -r1.46.2.1 -r1.46.2.2 src/sys/arch/i386/conf/VIRTUALPC

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