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/wil6210/txrx.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/4965-mac.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/common.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/common.h
Simple merge

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

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