CVS commit: [wrstuden-revivesa] src/sys/sys

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

Module Name:    src
Committed By:   wrstuden
Date:           Tue Jun 24 02:07:36 UTC 2008

Modified Files:
        src/sys/sys [wrstuden-revivesa]: Makefile lwp.h proc.h

Log Message:
Fix merge conflicts.


To generate a diff of this commit:
cvs rdiff -r1.108.12.1 -r1.108.12.2 src/sys/sys/Makefile
cvs rdiff -r1.94.2.3 -r1.94.2.4 src/sys/sys/lwp.h
cvs rdiff -r1.276.2.3 -r1.276.2.4 src/sys/sys/proc.h

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