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

Conflicts:
	net/mac80211/debugfs_sta.c
	net/mac80211/sta_info.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/bcma/main.c
Simple merge

diff --cc drivers/bcma/scan.c
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/iwl-commands.h
Simple merge

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

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/init.c
Simple merge

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

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

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

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