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

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
Simple merge

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

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

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

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge

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

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

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

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

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

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

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

diff --cc net/bluetooth/sco.c
Simple merge

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

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

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

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

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

diff --cc net/wireless/core.h
index d5d06fdea9612773c2c22f2bb3563a6b19cb0485,5845c2b37aa832b444906ad4fb0e4e74f06c3ee3..124e5e773fbc1e7fc4332b7e0ef79de669c0c784
--- 1/net/wireless/core.h
--- 2/net/wireless/core.h
+++ b/net/wireless/core.h
@@@ -500,9 -503,9 +500,12 @@@ int cfg80211_validate_beacon_int(struc
  void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
                               enum nl80211_iftype iftype, int num);
  
 +void cfg80211_leave(struct cfg80211_registered_device *rdev,
 +                  struct wireless_dev *wdev);
 +
+ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
+                             struct wireless_dev *wdev);
+ 
  #define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
  
  #ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS

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

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

diff --cc net/wireless/trace.h
Simple merge