CVS commit: src/sys

[David Young <dyoung%netbsd.org@localhost>]

Module Name:    src
Committed By:   dyoung
Date:           Tue Jul 26 22:52:48 UTC 2005

Modified Files:
        src/sys/dev/ic: ath.c athioctl.h athrate-amrr.c athrate-onoe.c athvar.h
        src/sys/net80211: ieee80211.c ieee80211.h ieee80211_acl.c
            ieee80211_crypto.c ieee80211_crypto.h ieee80211_crypto_ccmp.c
            ieee80211_crypto_none.c ieee80211_crypto_tkip.c
            ieee80211_crypto_wep.c ieee80211_input.c ieee80211_ioctl.c
            ieee80211_ioctl.h ieee80211_netbsd.c ieee80211_netbsd.h
            ieee80211_node.c ieee80211_node.h ieee80211_output.c
            ieee80211_proto.c ieee80211_proto.h ieee80211_radiotap.h
            ieee80211_rssadapt.c ieee80211_rssadapt.h ieee80211_sysctl.h
            ieee80211_var.h ieee80211_xauth.c
        src/sys/sys: mbuf.h

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.54 -r1.55 src/sys/dev/ic/ath.c
cvs rdiff -r1.8 -r1.9 src/sys/dev/ic/athioctl.h
cvs rdiff -r1.3 -r1.4 src/sys/dev/ic/athrate-amrr.c
cvs rdiff -r1.4 -r1.5 src/sys/dev/ic/athrate-onoe.c
cvs rdiff -r1.12 -r1.13 src/sys/dev/ic/athvar.h
cvs rdiff -r1.39 -r1.40 src/sys/net80211/ieee80211.c
cvs rdiff -r1.13 -r1.14 src/sys/net80211/ieee80211.h
cvs rdiff -r1.2 -r1.3 src/sys/net80211/ieee80211_acl.c \
    src/sys/net80211/ieee80211_crypto_ccmp.c \
    src/sys/net80211/ieee80211_crypto_none.c \
    src/sys/net80211/ieee80211_crypto_tkip.c \
    src/sys/net80211/ieee80211_crypto_wep.c \
    src/sys/net80211/ieee80211_xauth.c
cvs rdiff -r1.8 -r1.9 src/sys/net80211/ieee80211_crypto.c
cvs rdiff -r1.4 -r1.5 src/sys/net80211/ieee80211_crypto.h \
    src/sys/net80211/ieee80211_netbsd.h src/sys/net80211/ieee80211_rssadapt.h \
    src/sys/net80211/ieee80211_sysctl.h
cvs rdiff -r1.43 -r1.44 src/sys/net80211/ieee80211_input.c
cvs rdiff -r1.20 -r1.21 src/sys/net80211/ieee80211_ioctl.c \
    src/sys/net80211/ieee80211_proto.c
cvs rdiff -r1.9 -r1.10 src/sys/net80211/ieee80211_ioctl.h
cvs rdiff -r1.5 -r1.6 src/sys/net80211/ieee80211_netbsd.c
cvs rdiff -r1.41 -r1.42 src/sys/net80211/ieee80211_node.c
cvs rdiff -r1.17 -r1.18 src/sys/net80211/ieee80211_node.h
cvs rdiff -r1.32 -r1.33 src/sys/net80211/ieee80211_output.c
cvs rdiff -r1.11 -r1.12 src/sys/net80211/ieee80211_proto.h \
    src/sys/net80211/ieee80211_radiotap.h \
    src/sys/net80211/ieee80211_rssadapt.c
cvs rdiff -r1.19 -r1.20 src/sys/net80211/ieee80211_var.h
cvs rdiff -r1.112 -r1.113 src/sys/sys/mbuf.h

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