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

diff --cc drivers/bcma/host_pci.c
Simple merge

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

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

diff --cc include/linux/bcma/bcma_driver_chipcommon.h
Simple merge

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