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

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

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

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

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

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

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

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