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

Conflicts:
	drivers/net/wireless/mwifiex/cfg80211.c

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

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

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
index 2ab903f49691fe86e5bca1eb249be1cb47df73b8,780d3e168297fcf80c62e4345ac6d29c22007b73..fdb1eb861021287b5c6f9f2aa30ab35601108be3
--- 1/drivers/net/wireless/mwifiex/cfg80211.c
--- 2/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@@ -1826,13 -1825,6 +1826,11 @@@ mwifiex_cfg80211_scan(struct wiphy *wip
                return -EBUSY;
        }
  
-       priv->scan_request = request;
- 
 +      if (priv->user_scan_cfg) {
 +              dev_err(priv->adapter->dev, "cmd: Scan already in process..\n");
 +              return -EBUSY;
 +      }
 +
        priv->user_scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg),
                                      GFP_KERNEL);
        if (!priv->user_scan_cfg) {

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

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

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

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

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

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

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