CVS commit: [wrstuden-revivesa] src/sys

[Bill Stouder-Studenmund <wrstuden%netbsd.org@localhost>]

Module Name:    src
Committed By:   wrstuden
Date:           Tue Jun 24 04:15:51 UTC 2008

Modified Files:
        src/sys/arch/amd64/amd64 [wrstuden-revivesa]: trap.c
        src/sys/arch/bebox/conf [wrstuden-revivesa]: GENERIC
        src/sys/arch/i386/i386 [wrstuden-revivesa]: trap.c
        src/sys/arch/pmax/ibus [wrstuden-revivesa]: ibus_3max.c
        src/sys/arch/pmax/tc [wrstuden-revivesa]: tcbus.c
        src/sys/arch/usermode/conf [wrstuden-revivesa]: GENERIC
        src/sys/arch/vax/vax [wrstuden-revivesa]: trap.c
        src/sys/arch/x86/x86 [wrstuden-revivesa]: tsc.c
        src/sys/fs/udf [wrstuden-revivesa]: udf_osta.c

Log Message:
Hand-merge files that didn't merge right in recent sync w/ current.


To generate a diff of this commit:
cvs rdiff -r1.47.2.3 -r1.47.2.4 src/sys/arch/amd64/amd64/trap.c
cvs rdiff -r1.107.12.1 -r1.107.12.2 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -r1.237.2.3 -r1.237.2.4 src/sys/arch/i386/i386/trap.c
cvs rdiff -r1.10.114.1 -r1.10.114.2 src/sys/arch/pmax/ibus/ibus_3max.c
cvs rdiff -r1.20.64.1 -r1.20.64.2 src/sys/arch/pmax/tc/tcbus.c
cvs rdiff -r1.1 -r1.1.20.1 src/sys/arch/usermode/conf/GENERIC
cvs rdiff -r1.113.6.3 -r1.113.6.4 src/sys/arch/vax/vax/trap.c
cvs rdiff -r1.15.2.1 -r1.15.2.2 src/sys/arch/x86/x86/tsc.c
cvs rdiff -r1.5.14.1 -r1.5.14.2 src/sys/fs/udf/udf_osta.c

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