Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
	drivers/net/wireless/ath/ath6kl/init.c

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

diff --cc drivers/net/wireless/ath/ath6kl/debug.c
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/debug.h
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/init.c
index c614049d7b2ea6a431d48d0eb464b1245aaf466f,30050af9d4c67a4bb1a774e040ea045d5e3c1d7f..368ecbd172a3d03225d7d7ccfc6a19d21aee61f9
--- 1/drivers/net/wireless/ath/ath6kl/init.c
--- 2/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@@ -1663,16 -1603,7 +1663,17 @@@ int ath6kl_core_init(struct ath6kl *ar
  
        ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |
                            WIPHY_FLAG_HAVE_AP_SME |
 -                          WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
++                          WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |
 +                          WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;
 +
 +      if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN, ar->fw_capabilities))
 +              ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
 +
 +      ar->wiphy->probe_resp_offload =
 +              NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |
 +              NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |
 +              NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P |
 +              NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U;
  
        set_bit(FIRST_BOOT, &ar->flag);
  

diff --cc drivers/net/wireless/ath/ath6kl/sdio.c
Simple merge