CVS commit: [ktrace-lwp] src/sys/arch

[Nick Hudson <skrll%netbsd.org@localhost>]

Module Name:    src
Committed By:   skrll
Date:           Thu Aug  5 20:23:06 UTC 2004

Modified Files:
        src/sys/arch/acorn32/mainbus [ktrace-lwp]: fd.c
        src/sys/arch/hp700/conf [ktrace-lwp]: GENERIC
        src/sys/arch/hp700/hp700 [ktrace-lwp]: autoconf.c
        src/sys/arch/hppa/include [ktrace-lwp]: mcontext.h
        src/sys/arch/i386/conf [ktrace-lwp]: GENERIC
        src/sys/arch/mipsco/stand [ktrace-lwp]: Makefile.booters
        src/sys/arch/newsmips/apbus [ktrace-lwp]: xafb.c
        src/sys/arch/newsmips/include [ktrace-lwp]: Makefile

Log Message:
Fix some merge mistakes.


To generate a diff of this commit:
cvs rdiff -r1.16.2.2 -r1.16.2.3 src/sys/arch/acorn32/mainbus/fd.c
cvs rdiff -r1.15.2.1 -r1.15.2.2 src/sys/arch/hp700/conf/GENERIC
cvs rdiff -r1.7.2.1 -r1.7.2.2 src/sys/arch/hp700/hp700/autoconf.c
cvs rdiff -r1.3.2.1 -r1.3.2.2 src/sys/arch/hppa/include/mcontext.h
cvs rdiff -r1.564.2.2 -r1.564.2.3 src/sys/arch/i386/conf/GENERIC
cvs rdiff -r1.5.6.1 -r1.5.6.2 src/sys/arch/mipsco/stand/Makefile.booters
cvs rdiff -r1.5.6.1 -r1.5.6.2 src/sys/arch/newsmips/apbus/xafb.c
cvs rdiff -r1.27.2.1 -r1.27.2.2 src/sys/arch/newsmips/include/Makefile

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