Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

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

diff --cc drivers/net/wireless/iwlegacy/common.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
index 6c57e832ae8396032fdc2f452a70867d223cf0b8,6ca571a1b8e2ecbd171b9540a4b47ee1c558c508..e27b3168862cdf72075b3125c3f93175692ecd25
--- 1/drivers/net/wireless/mwifiex/cfg80211.c
--- 2/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@@ -1701,7 -1635,13 +1702,7 @@@ struct wireless_dev *mwifiex_add_virtua
  #ifdef CONFIG_DEBUG_FS
        mwifiex_dev_debugfs_init(priv);
  #endif
-       return dev;
+       return wdev;
 -error:
 -      if (dev && (dev->reg_state == NETREG_UNREGISTERED))
 -              free_netdev(dev);
 -      priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
 -
 -      return NULL;
  }
  EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf);
  

diff --cc drivers/net/wireless/mwifiex/main.h
Simple merge

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

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

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