Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

Requested by Luca, needed for upcoming patch "iwlwifi: add a bunch of new 9000
PCI IDs".

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

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
index 5975b3d,ebe35e6..105b877
--- 1/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--- 2/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@@ -73,9 -72,13 +73,13 @@@ module_param_named(fcmode, brcmf_fcmode
  MODULE_PARM_DESC(fcmode, "Mode of firmware signalled flow control");
  
  static int brcmf_roamoff;
 -module_param_named(roamoff, brcmf_roamoff, int, S_IRUSR);
 +module_param_named(roamoff, brcmf_roamoff, int, 0400);
  MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine");
  
+ static int brcmf_iapp_enable;
+ module_param_named(iapp, brcmf_iapp_enable, int, 0);
+ MODULE_PARM_DESC(iapp, "Enable partial support for the obsoleted Inter-Access Point Protocol");
+ 
  #ifdef DEBUG
  /* always succeed brcmf_bus_started() */
  static int brcmf_ignore_probe_fail;

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