Module Name:	src
Committed By:	skrll
Date:		Fri Aug  6 10:14:01 UTC 2004

Modified Files:
	src/sys/arch/hppa/hppa [ktrace-lwp]: procfs_machdep.c sig_machdep.c
	src/sys/arch/powerpc/marvell [ktrace-lwp]: bus_dma.c
	src/sys/arch/x86/include [ktrace-lwp]: pci_machdep.h
	src/sys/compat/darwin [ktrace-lwp]: darwin_sysent.c
	src/sys/compat/linux [ktrace-lwp]: Makefile.inc
	src/sys/compat/mach [ktrace-lwp]: mach_exception.c
	src/sys/compat/mach/arch/powerpc/fasttraps [ktrace-lwp]: Makefile
	src/sys/compat/mach/arch/powerpc/ppccalls [ktrace-lwp]: Makefile
	src/sys/conf [ktrace-lwp]: majors

Log Message:
Fix merge mistakes.


To generate a diff of this commit:
cvs rdiff -r1.1.10.1 -r1.1.10.2 src/sys/arch/hppa/hppa/procfs_machdep.c
cvs rdiff -r1.2.8.1 -r1.2.8.2 src/sys/arch/hppa/hppa/sig_machdep.c
cvs rdiff -r1.4.2.2 -r1.4.2.3 src/sys/arch/powerpc/marvell/bus_dma.c
cvs rdiff -r1.2.2.1 -r1.2.2.2 src/sys/arch/x86/include/pci_machdep.h
cvs rdiff -r1.26.2.1 -r1.26.2.2 src/sys/compat/darwin/darwin_sysent.c
cvs rdiff -r1.2.46.1 -r1.2.46.2 src/sys/compat/linux/Makefile.inc
cvs rdiff -r1.4.2.1 -r1.4.2.2 src/sys/compat/mach/mach_exception.c
cvs rdiff -r1.1.8.1 -r1.1.8.2 \
    src/sys/compat/mach/arch/powerpc/fasttraps/Makefile
cvs rdiff -r1.1.8.1 -r1.1.8.2 \
    src/sys/compat/mach/arch/powerpc/ppccalls/Makefile
cvs rdiff -r1.10.2.1 -r1.10.2.2 src/sys/conf/majors

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