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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/wifi.h
Simple merge

diff --cc drivers/staging/brcm80211/sys/wl_mac80211.c
Simple merge

diff --cc drivers/staging/brcm80211/sys/wlc_mac80211.c
Simple merge

diff --cc net/mac80211/Kconfig
Simple merge