merge
authorJohannes Hofmann <johannes.hofmann@gmx.de>
Thu, 24 Jan 2013 22:06:50 +0000 (23:06 +0100)
committerJohannes Hofmann <johannes.hofmann@gmx.de>
Thu, 24 Jan 2013 22:06:50 +0000 (23:06 +0100)
commit4da66bbfa353d0fb44e7a3c17f7268748edba48b
treeb119c70e15a2c2bd1931200d95b038c4f25e73be
parent7078f92bf00cafccd0c0191c7aa92b0bb784f70e
parent4b21dd0f0da646cb709ebded87a4e4990a95522a
merge
sys/dev/netif/ath/ath/if_ath.c
sys/dev/netif/iwn/if_iwn.c
sys/netproto/802_11/wlan/ieee80211_output.c
sys/netproto/802_11/wlan/ieee80211_proto.c