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

Conflicts:
	drivers/net/wireless/iwlwifi/dvm/tx.c
	drivers/net/wireless/ti/wlcore/sdio.c
	drivers/net/wireless/ti/wlcore/spi.c

diff --cc drivers/net/wireless/ath/ath9k/rc.c
Simple merge

diff --cc drivers/net/wireless/ath/wil6210/wmi.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
Simple merge

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

diff --cc drivers/net/wireless/libertas/cfg.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/scan.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/sta_ioctl.c
Simple merge

diff --cc drivers/net/wireless/p54/p54usb.c
Simple merge

diff --cc drivers/net/wireless/rndis_wlan.c
Simple merge

diff --cc drivers/net/wireless/ti/wlcore/wlcore_i.h
Simple merge

diff --cc drivers/staging/wlan-ng/cfg80211.c
Simple merge

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

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

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

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