Module Name:	src
Committed By:	dyoung
Date:		Tue Jul 12 21:27:41 UTC 2005

Update of /u1/rsync-repo/src
In directory cuw.ojctech.com:/u3/dyoung/fbsd-import-2005-07-11/net80211-import

Log Message:
Import FreeBSD's net80211(9) of 2005-07-11


Vendor Tag:	FreeBSD
Release Tags:	net80211-2005-07-11
		
U src/sys/net80211/_ieee80211.h
U src/sys/net80211/ieee80211.c
C src/sys/net80211/ieee80211.h
U src/sys/net80211/ieee80211_acl.c
C src/sys/net80211/ieee80211_crypto.c
C src/sys/net80211/ieee80211_crypto.h
C src/sys/net80211/ieee80211_crypto_ccmp.c
C src/sys/net80211/ieee80211_crypto_none.c
C src/sys/net80211/ieee80211_crypto_tkip.c
C src/sys/net80211/ieee80211_crypto_wep.c
C src/sys/net80211/ieee80211_input.c
C src/sys/net80211/ieee80211_ioctl.c
C src/sys/net80211/ieee80211_ioctl.h
U src/sys/net80211/ieee80211_netbsd.c
C src/sys/net80211/ieee80211_netbsd.h
C src/sys/net80211/ieee80211_node.c
C src/sys/net80211/ieee80211_node.h
C src/sys/net80211/ieee80211_output.c
C src/sys/net80211/ieee80211_proto.c
U src/sys/net80211/ieee80211_proto.h
U src/sys/net80211/ieee80211_radiotap.h
C src/sys/net80211/ieee80211_var.h
U src/sys/net80211/ieee80211_xauth.c

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

	cvs checkout -jFreeBSD:yesterday -jFreeBSD src