merge with calder

merge with calder

SCCS-vsn: sys/kern/kern_descrip.c 5.2
SCCS-vsn: sys/sys/file.h 4.11
SCCS-vsn: sys/sys/socket.h 4.17
SCCS-vsn: sys/kern/kern_proc.c 4.28
SCCS-vsn: sys/sys/socketvar.h 4.17
SCCS-vsn: sys/kern/kern_prot.c 5.3
SCCS-vsn: sys/kern/kern_resource.c 4.10
SCCS-vsn: sys/kern/kern_sig.c 5.2
SCCS-vsn: sys/kern/kern_time.c 5.2
SCCS-vsn: sys/kern/subr_xxx.c 4.13
SCCS-vsn: sys/kern/uipc_domain.c 5.2
SCCS-vsn: sys/kern/sys_generic.c 5.3
SCCS-vsn: sys/kern/sys_process.c 5.2
SCCS-vsn: sys/kern/uipc_syscalls.c 4.21
SCCS-vsn: sys/kern/tty.c 4.24
SCCS-vsn: sys/kern/vfs_vnops.c 4.25
SCCS-vsn: sys/ufs/ffs/ffs_inode.c 4.19
SCCS-vsn: sys/ufs/ffs/ufs_inode.c 4.19
SCCS-vsn: sys/ufs/lfs/lfs_inode.c 4.19
SCCS-vsn: sys/ufs/ufs/ufs_inode.c 4.19
SCCS-vsn: sys/kern/vfs_syscalls.c 4.30
SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 4.30
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 4.30
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 4.30
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 4.30