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

diff --cc MAINTAINERS
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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