Module Name:	src
Committed By:	skrll
Date:		Mon Sep 10 11:34:11 UTC 2007

Modified Files:
	src/lib/libpthread: pthread_int.h pthread_lock.c pthread_mutex.c
	    pthread_mutex2.c pthread_rwlock2.c pthread_spin.c
	src/lib/libpthread_dbg: pthread_dbg.c
	src/sys/arch/alpha/include: lock.h
	src/sys/arch/arm/include: lock.h
	src/sys/arch/hp700/hp700: genassym.cf
	src/sys/arch/hppa/hppa: lock_stubs.S
	src/sys/arch/hppa/include: lock.h mutex.h types.h
	src/sys/arch/m68k/include: lock.h
	src/sys/arch/mips/include: lock.h
	src/sys/arch/powerpc/include: lock.h
	src/sys/arch/sh3/include: lock.h
	src/sys/arch/sparc/include: lock.h
	src/sys/arch/vax/include: lock.h
	src/sys/arch/x86/include: lock.h
	src/sys/kern: kern_lock.c kern_mutex.c

Log Message:
Merge nick-csl-alignment.


To generate a diff of this commit:
cvs rdiff -r1.52 -r1.53 src/lib/libpthread/pthread_int.h
cvs rdiff -r1.26 -r1.27 src/lib/libpthread/pthread_lock.c
cvs rdiff -r1.33 -r1.34 src/lib/libpthread/pthread_mutex.c
cvs rdiff -r1.3 -r1.4 src/lib/libpthread/pthread_mutex2.c
cvs rdiff -r1.2 -r1.3 src/lib/libpthread/pthread_rwlock2.c
cvs rdiff -r1.1 -r1.2 src/lib/libpthread/pthread_spin.c
cvs rdiff -r1.37 -r1.38 src/lib/libpthread_dbg/pthread_dbg.c
cvs rdiff -r1.24 -r1.25 src/sys/arch/alpha/include/lock.h
cvs rdiff -r1.13 -r1.14 src/sys/arch/arm/include/lock.h
cvs rdiff -r1.12 -r1.13 src/sys/arch/hp700/hp700/genassym.cf
cvs rdiff -r1.7 -r1.8 src/sys/arch/hppa/hppa/lock_stubs.S
cvs rdiff -r1.11 -r1.12 src/sys/arch/hppa/include/lock.h
cvs rdiff -r1.5 -r1.6 src/sys/arch/hppa/include/mutex.h
cvs rdiff -r1.14 -r1.15 src/sys/arch/hppa/include/types.h
cvs rdiff -r1.11 -r1.12 src/sys/arch/m68k/include/lock.h
cvs rdiff -r1.12 -r1.13 src/sys/arch/mips/include/lock.h
cvs rdiff -r1.9 -r1.10 src/sys/arch/powerpc/include/lock.h
cvs rdiff -r1.12 -r1.13 src/sys/arch/sh3/include/lock.h
cvs rdiff -r1.28 -r1.29 src/sys/arch/sparc/include/lock.h
cvs rdiff -r1.25 -r1.26 src/sys/arch/vax/include/lock.h
cvs rdiff -r1.14 -r1.15 src/sys/arch/x86/include/lock.h
cvs rdiff -r1.118 -r1.119 src/sys/kern/kern_lock.c
cvs rdiff -r1.15 -r1.16 src/sys/kern/kern_mutex.c

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