Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-scan.c
	net/wireless/nl80211.c

diff --cc drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
Simple merge

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

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

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

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

diff --cc net/wireless/nl80211.c
index bf3fc4f264f50af6f78413c9537d460d704a52de,ea40d540a9901d6f1c5fe4857583136b57e11bdf..b85075761e2422eaa2f8f2170501359b3e400bab
--- 1/net/wireless/nl80211.c
--- 2/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -4300,7 -4113,14 +4300,10 @@@ static int nl80211_crypto_settings(stru
                if (len % sizeof(u32))
                        return -EINVAL;
  
+               if (settings->n_akm_suites > NL80211_MAX_NR_AKM_SUITES)
+                       return -EINVAL;
+ 
                memcpy(settings->akm_suites, data, len);
 -
 -              for (i = 0; i < settings->n_akm_suites; i++)
 -                      if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
 -                              return -EINVAL;
        }
  
        return 0;