Commits

Merge branch 'master' of git://git.infradead.org/users/linville/wireless Conflicts: drivers/net/wireless/iwlwifi/iwl-scan.c net/wireless/nl80211.c
Merge branch 'master' of git://git.infradead.org/users/linville/wireless Conflicts: drivers/net/wireless/iwlwifi/iwl-scan.c net/wireless/nl80211.c