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

diff --cc drivers/bcma/bcma_private.h
Simple merge

diff --cc drivers/bcma/driver_chipcommon_nflash.c
Simple merge

diff --cc drivers/bcma/main.c
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/iwl-fw.h
Simple merge

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

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

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

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

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

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

diff --cc drivers/net/wireless/ti/wlcore/wlcore_i.h
index 5ce26cf,20316ac..910f8e2
--- 1/drivers/net/wireless/ti/wlcore/wlcore_i.h
--- 2/drivers/net/wireless/ti/wlcore/wlcore_i.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
@@@ -109,22 -109,11 +109,11 @@@ enum 
        NUM_FW_VER
  };
  
- #define FW_VER_CHIP_WL127X 6
- #define FW_VER_CHIP_WL128X 7
- 
- #define FW_VER_IF_TYPE_STA 1
- #define FW_VER_IF_TYPE_AP  2
- 
- #define FW_VER_MINOR_1_SPARE_STA_MIN 58
- #define FW_VER_MINOR_1_SPARE_AP_MIN  47
- 
- #define FW_VER_MINOR_FWLOG_STA_MIN 70
- 
  struct wl1271_chip {
        u32 id;
 -      char fw_ver_str[ETHTOOL_BUSINFO_LEN];
 +      char fw_ver_str[ETHTOOL_FWVERS_LEN];
        unsigned int fw_ver[NUM_FW_VER];
 -      char phy_fw_ver_str[ETHTOOL_BUSINFO_LEN];
 +      char phy_fw_ver_str[ETHTOOL_FWVERS_LEN];
  };
  
  #define NUM_TX_QUEUES              4

diff --cc drivers/ssb/main.c
Simple merge

diff --cc include/linux/bcma/bcma_driver_chipcommon.h
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

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