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

diff --cc MAINTAINERS
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/ipw2x00/ipw2100.c
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index eda30b9d0f15b90724a23c43d3afb001cdddc118,345d752137fa00e5725415a54b39e444a35acf4c..f1b36005c6a2c9496bdce302e17571a144cf2393
--- 1/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
--- 2/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@@ -226,10 -227,13 +227,10 @@@ static int rtl92s_init_sw_vars(struct i
  
        /* for firmware buf */
        rtlpriv->rtlhal.pfirmware = vzalloc(sizeof(struct rt_firmware));
 -      if (!rtlpriv->rtlhal.pfirmware) {
 -              RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 -                       "Can't alloc buffer for fw\n");
 +      if (!rtlpriv->rtlhal.pfirmware)
                return 1;
 -      }
  
-       rtlpriv->max_fw_size = sizeof(struct rt_firmware);
+       rtlpriv->max_fw_size = RTL8190_MAX_RAW_FIRMWARE_CODE_SIZE;
  
        pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
                "Loading firmware %s\n", rtlpriv->cfg->fw_name);