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

diff --cc drivers/net/wireless/b43/Kconfig
Simple merge

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

diff --cc drivers/net/wireless/brcm80211/brcmfmac/usb.c
Simple merge

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

diff --cc drivers/net/wireless/mwifiex/cfg80211.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/pcie.c
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/mwifiex/util.h
Simple merge

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

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

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

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