Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/brcm80211/Kconfig
	net/mac80211/util.c

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/wcn36xx/smd.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/Kconfig
index 57918579d55ddd52ce2c1ebc9d4e8d2989c7370d,54e36fcb39542e8361dfdc019134f3ba1538de8f..fcfed6b99a62d6e16e66634df2df85198cbb64da
--- 1/drivers/net/wireless/brcm80211/Kconfig
--- 2/drivers/net/wireless/brcm80211/Kconfig
+++ b/drivers/net/wireless/brcm80211/Kconfig
@@@ -4,10 -4,13 +4,12 @@@ config BRCMUTI
  config BRCMSMAC
        tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
        depends on MAC80211
 -      depends on BCMA
 +      depends on BCMA_POSSIBLE
 +      select BCMA
+       select NEW_LEDS if BCMA_DRIVER_GPIO
+       select LEDS_CLASS if BCMA_DRIVER_GPIO
        select BRCMUTIL
        select FW_LOADER
 -      select CRC_CCITT
 -      select CRC8
        select CORDIC
        ---help---
          This module adds support for PCIe wireless adapters based on Broadcom

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

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/ibss.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/mesh.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/rc80211_minstrel_ht.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/scan.c
Simple merge

diff --cc net/mac80211/util.c
index 06265d7f8cc375d47e804623503af3540ec3eb38,9f9b9bd3fd44798e7030fb3a44c46da962cfd7ba..875e172c001c697a72f85941fd0db8ef1b28b86a
--- 1/net/mac80211/util.c
--- 2/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@@ -2481,13 -2457,9 +2479,8 @@@ int ieee80211_send_action_csa(struct ie
                          WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00;
                put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd */
                pos += 2;
-               if (!ifmsh->pre_value)
-                       ifmsh->pre_value = 1;
-               else
-                       ifmsh->pre_value++;
 -              pre_value = cpu_to_le16(ifmsh->pre_value);
 -              memcpy(pos, &pre_value, 2);             /* Precedence Value */
 +              put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence Value */
                pos += 2;
-               ifmsh->chsw_init = true;
        }
  
        ieee80211_tx_skb(sdata, skb);

diff --cc net/wireless/core.c
Simple merge

diff --cc net/wireless/ibss.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge