Merge mac80211-next into ath-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Mon, 30 Mar 2015 07:07:12 +0000 (10:07 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 30 Mar 2015 07:07:12 +0000 (10:07 +0300)
Patch "ath10k: introduce basic tdls functionality" depends on this mac80211
patch:

c23e31cf7b55 mac80211: initialize rate control earlier for tdls station

1  2 
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/wil6210/cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c

Simple merge