Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 10/08/1996 23:00:02
thorpej
Tue Oct  8 15:56:06 PDT 1996
Update of /a/cvsroot/src/sys/arch/amiga/amiga
In directory netbsd1:/home/jtc/src-current/src/sys/arch/amiga/amiga

Modified Files:
	locore.s 
Log Message:
Merge netbsd-1-2 branch back into mainline.


thorpej
Tue Oct  8 15:58:27 PDT 1996
Update of /a/cvsroot/src/sys/arch/amiga/amiga
In directory netbsd1:/home/jtc/src-current/src/sys/arch/amiga/amiga

Modified Files:
	machdep.c 
Log Message:
Merge netbsd-1-2 branch back into mainline.