fvdl
Sun Oct 19 17:11:05 PDT 1997
Update of /a/cvsroot/src/sys/dev
In directory netbsd1:/var/slash-tmp/cvs-serv21705

Modified Files:
	vnd.c 
Log Message:
Do hack around VOP_BMAP call to avoid recursive locks. The locking
interface doesn't allow currently to specify recursive locks.
Should fix vnd device locking panics.


thorpej
Sun Oct 19 17:14:51 PDT 1997
Update of /cvsroot/src/sys/dev/pci
In directory netbsd1:/var/slash-tmp/cvs-serv22334

Log Message:
Import the latest FreeBSD "fxp" driver, as of 971019.

Status:

Vendor Tag:	FREEBSD
Release Tags:	FreeBSD-current-971019
		
C src/sys/dev/pci/if_fxp.c
C src/sys/dev/pci/if_fxpreg.h
C src/sys/dev/pci/if_fxpvar.h

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

	cvs checkout -jFREEBSD:yesterday -jFREEBSD src/sys/dev/pci