Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath

Conflicts:
	drivers/net/wireless/ath/ath10k/htc.c
	drivers/net/wireless/ath/ath10k/mac.c

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

diff --cc drivers/net/wireless/ath/ath10k/htc.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/mac.c
index 06fe2b8fa22dd40a0817b1f38725d6106491fa34,7d3d3ac2343abb15cab59421f1e23a692275ee4e..ce9ef3499ecb8a90fecc87071437bb7310e17e89
--- 1/drivers/net/wireless/ath/ath10k/mac.c
--- 2/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@@ -1356,7 -1482,10 +1482,10 @@@ static int ath10k_update_channel_list(s
                        ch->ht40plus =
                                !(channel->flags & IEEE80211_CHAN_NO_HT40PLUS);
  
 -                      passive = channel->flags & IEEE80211_CHAN_PASSIVE_SCAN;
+                       ch->chan_radar =
+                               !!(channel->flags & IEEE80211_CHAN_RADAR);
+ 
 +                      passive = channel->flags & IEEE80211_CHAN_NO_IR;
                        ch->passive = passive;
  
                        ch->freq = channel->center_freq;

diff --cc drivers/net/wireless/ath/ath10k/pci.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/wmi.c
Simple merge