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

Conflicts:
	drivers/net/wireless/rt2x00/rt2x00pci.c

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

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

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

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

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

diff --cc drivers/net/wireless/rt2x00/Kconfig
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800pci.c
Simple merge

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

diff --cc net/mac80211/ieee80211_i.h
Simple merge

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

diff --cc net/mac80211/offchannel.c
index b01eb7314ec670ebab5d686a3ac2df7acd5616a2,430bd254e49693bf7e62744843fff8c10a2acb9a..cce795871ab1fa2373a7828d4c9872695bb0ef1e
--- 1/net/mac80211/offchannel.c
--- 2/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@@ -370,10 -379,10 +379,10 @@@ void ieee80211_sw_roc_work(struct work_
   finish:
                list_del(&roc->list);
                started = roc->started;
-               ieee80211_roc_notify_destroy(roc);
+               ieee80211_roc_notify_destroy(roc, !roc->abort);
  
                if (started) {
 -                      drv_flush(local, false);
 +                      ieee80211_flush_queues(local, NULL);
  
                        local->tmp_channel = NULL;
                        ieee80211_hw_config(local, 0);

diff --cc net/nfc/llcp/llcp.c
Simple merge

diff --cc net/nfc/llcp/sock.c
Simple merge

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