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

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

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

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

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

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

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

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

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