Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Fri, 20 Jul 2012 16:30:48 +0000 (12:30 -0400)]
15 files changed:
1  2 
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/sta_cmd.c
drivers/net/wireless/mwifiex/sta_cmdresp.c
drivers/net/wireless/rtlwifi/base.c
drivers/net/wireless/rtlwifi/pci.c
drivers/net/wireless/ti/wlcore/tx.c
net/mac80211/rx.c
net/mac80211/scan.c
net/wireless/nl80211.c

Simple merge
Simple merge
@@@ -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));
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge