Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Feb 2013 18:47:13 +0000 (13:47 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Feb 2013 18:47:13 +0000 (13:47 -0500)
commit98d5fac2330779e6eea6431a90b44c7476260dcc
tree99870656d835fc6c12093bc67517956cc7b3d6ec
parent4153577a8d318ae02b3791341e10e78416de402f
parent9e97d14b4923da524d202f2e005d5d30b70db9d6
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/ti/wlcore/sdio.c
drivers/net/wireless/ti/wlcore/spi.c
17 files changed:
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/ath/wil6210/wmi.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
drivers/net/wireless/brcm80211/brcmfmac/usb.c
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/scan.c
drivers/net/wireless/mwifiex/sta_ioctl.c
drivers/net/wireless/p54/p54usb.c
drivers/net/wireless/rndis_wlan.c
drivers/net/wireless/ti/wlcore/wlcore_i.h
drivers/staging/wlan-ng/cfg80211.c
include/net/cfg80211.h
net/wireless/core.c
net/wireless/reg.c
net/wireless/sysfs.c