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

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

diff --cc drivers/net/wireless/ath/ath5k/mac80211-ops.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.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 drivers/net/wireless/rtl818x/rtl8187/dev.c
Simple merge

diff --cc drivers/staging/winbond/wbusb.c
Simple merge

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

diff --cc include/net/cfg80211.h
Simple merge

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

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

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

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

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