Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 22 May 2014 17:58:36 +0000 (13:58 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 22 May 2014 17:58:36 +0000 (13:58 -0400)
commit40a10fd740a4d5a9f3da255cf8dae48c6723d1a6
treea65eb4adca8e37ed7335345e94e36918593f7f92
parent99abe65ff18b6bbac2e55524827b571c3eccfa86
parent67af9811539be83dbdc0739215d29af23c870405
Merge git://git./linux/kernel/git/jberg/mac80211-next
18 files changed:
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/wmi.c
drivers/net/wireless/ath/ath6kl/wmi.h
drivers/net/wireless/ath/wil6210/main.c
drivers/net/wireless/ath/wil6210/wil6210.h
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/mwifiex/11n.h
drivers/net/wireless/mwifiex/main.h
drivers/net/wireless/mwifiex/tdls.c
drivers/net/wireless/mwifiex/wmm.c
include/net/cfg80211.h
net/mac80211/chan.c
net/mac80211/main.c
net/mac80211/trace.h
net/mac80211/util.c
net/rfkill/rfkill-gpio.c
net/wireless/scan.c
net/wireless/sme.c