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

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

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmsmac/main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/wireless/libertas/if_usb.c
Simple merge

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

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

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

diff --cc drivers/net/wireless/mwifiex/sta_cmdresp.c
index 97715dfbdf58a786de59c887781ddf9b08cfeb09,e0178c0829d7ffbd12d547762d374cead3db06de..0b09004ebb25a3eebf6f5fe8f85bfd9c196f351c
--- 1/drivers/net/wireless/mwifiex/sta_cmdresp.c
--- 2/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@@ -280,9 -278,8 +278,8 @@@ static int mwifiex_ret_tx_rate_cfg(stru
        u16 tlv, tlv_buf_len;
        u8 *tlv_buf;
        u32 i;
-       int ret = 0;
  
 -      tlv_buf = (u8 *) ((u8 *) rate_cfg) +
 +      tlv_buf = ((u8 *)rate_cfg) +
                        sizeof(struct host_cmd_ds_tx_rate_cfg);
        tlv_buf_len = *(u16 *) (tlv_buf + sizeof(u16));
  

diff --cc drivers/net/wireless/rtlwifi/base.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge

diff --cc drivers/net/wireless/ti/wlcore/tx.c
Simple merge

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

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

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