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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wimax/i2400m/fw.c
Simple merge

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

diff --cc drivers/net/wireless/ath/carl9170/rx.c
Simple merge

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

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

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

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

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

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

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

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

diff --cc net/nfc/netlink.c
Simple merge

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