Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 05/23/1998 05:40:02
Sat May 23 05:31:05 PDT 1998
Update of /cvsroot/src/sys/arch/pc532
In directory nb00:/tmp/cvs-serv717

Log Message:
update to get Jason's changes into the pc532


Vendor Tag:	NETBSD_I386
Release Tags:	netbsd-current-19980523
C src/sys/arch/pc532/pc532/
C src/sys/arch/pc532/include/

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

	cvs checkout -jNETBSD_I386:yesterday -jNETBSD_I386 src/sys/arch/pc532