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

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

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

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

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

diff --cc drivers/net/wireless/iwlegacy/4965-rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-debugfs.c
Simple merge

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

diff --cc include/net/mac80211.h
Simple merge

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

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

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

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