merge
authorJohannes Hofmann <johannes.hofmann@gmx.de>
Sat, 12 Jan 2013 10:31:39 +0000 (11:31 +0100)
committerJohannes Hofmann <johannes.hofmann@gmx.de>
Sat, 12 Jan 2013 10:31:39 +0000 (11:31 +0100)
commit7078f92bf00cafccd0c0191c7aa92b0bb784f70e
tree73434dd8169e339a7a3954f9fa102a198927a00e
parent5b98ac740d0a3454a0c8668f738e3eb446c3a4b6
parentef31a1a8fc23435f0bb9e198ca7433d84f86068d
merge
sys/dev/netif/ath/ath/if_ath.c
sys/dev/netif/iwn/if_iwn.c
sys/netproto/802_11/wlan/ieee80211_ioctl.c
sys/netproto/802_11/wlan/ieee80211_output.c
sys/netproto/802_11/wlan/ieee80211_proto.c