Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...

Johannes Berg <johannes@sipsolutions.net> says:

"This relatively large batch of changes is comprised of the
following:
 * large mac80211-hwsim changes from Ben, Jukka and a bit myself
 * OCB/WAVE/11p support from Rostislav on behalf of the Czech Technical
   University in Prague and Volkswagen Group Research
 * minstrel VHT work from Karl
 * more CSA work from Luca
 * WMM admission control support in mac80211 (myself)
 * various smaller fixes, spelling corrections, and minor API additions"

Conflicts:
	drivers/net/wireless/ath/wil6210/cfg80211.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --cc drivers/net/wireless/ath/ath10k/core.h
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/net/wireless/ath/wil6210/cfg80211.c
index 4248fb3352d2f2dc4420101e8174b5e38d6b7752,8fdfa3222a6e72e1f77aabf2b6ee7a8e4311eed9..0fc0b9f8e605f0f51afb3e49e317b2e14cfcc9b4
--- 1/drivers/net/wireless/ath/wil6210/cfg80211.c
--- 2/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@@ -797,7 -798,7 +798,7 @@@ static int wil_cfg80211_del_station(str
        struct wil6210_priv *wil = wiphy_to_wil(wiphy);
  
        mutex_lock(&wil->mutex);
-       wil6210_disconnect(wil, mac, false);
 -      wil6210_disconnect(wil, params->mac);
++      wil6210_disconnect(wil, params->mac, false);
        mutex_unlock(&wil->mutex);
  
        return 0;

diff --cc drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/dvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge