mrg
Tue Oct  8 17:50:57 PDT 1996
Update of /cvsroot/src/sys/dev/sun
In directory netbsd1:/var/slash-tmp/cvs-serv12787

Modified Files:
	kbd.c ms.c 
Log Message:
select -> poll

thorpej
Tue Oct  8 17:59:17 PDT 1996
Update of /a/cvsroot/src/sys/kern
In directory netbsd1:/home/jtc/src-current/src/sys/kern

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