Module Name:	syssrc
Committed By:	imp
Date:		Mon Nov 19 05:24:27 UTC 2001

Modified Files:
	syssrc/sys/dev/pcmcia: pcmciadevs

Log Message:
Merge from FreeBSD:
	o Add devices from OpenBSD
	o Minor sorting problems in my sorting attempt.
	o A few additional -1 vendors for better card pattern generation.
	o Add Zoom Air_4000 (needs to be added to awi)
	o Add Netgear FA411 info (needs to be added to ne, plus quirks/fixes
	  to base pccard stuff before it will work).
	o Merges through FreeBSD 1.22


To generate a diff of this commit:
cvs rdiff -r1.146 -r1.147 syssrc/sys/dev/pcmcia/pcmciadevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.