thorpej
Thu Sep  4 19:05:39 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/common
In directory netbsd1:/var/slash-tmp/cvs-serv11748

Modified Files:
	bus_dma.c 
Log Message:
Implement bus_dmamem_mmap().


jtc
Thu Sep  4 19:07:36 PDT 1997
Update of /a/cvsroot/src/lib/libc/time
In directory netbsd1:/home/jtc/tzcode1997g

Log Message:
import tzcode1997g

Status:

Vendor Tag:	ADO
Release Tags:	TZCODE1997G
		
U src/lib/libc/time/README
U src/lib/libc/time/Theory
U src/lib/libc/time/tzset.3
U src/lib/libc/time/time2posix.3
U src/lib/libc/time/tzfile.5
U src/lib/libc/time/tzselect.8
U src/lib/libc/time/zic.8
U src/lib/libc/time/zdump.8
U src/lib/libc/time/tzfile.h
C src/lib/libc/time/private.h
C src/lib/libc/time/localtime.c
U src/lib/libc/time/asctime.c
U src/lib/libc/time/difftime.c
U src/lib/libc/time/zic.c
U src/lib/libc/time/zdump.c
C src/lib/libc/time/scheck.c
U src/lib/libc/time/ialloc.c
U src/lib/libc/time/tzselect.ksh
N src/lib/libc/time/Arts.htm
U src/lib/libc/time/WWW.htm
U src/lib/libc/time/checktab.awk
U src/lib/libc/time/ctime.3

3 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jADO:yesterday -jADO src/lib/libc/time