]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 6 Dec 2013 14:50:45 +0000 (09:50 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 6 Dec 2013 14:50:45 +0000 (09:50 -0500)
commit0cb1433ab6373e204dccde5c52f50a86a12358bf
tree2b2a705710e6374cc037f89bcc7bfc25047485ba
parent1280bae1d1275687e265a9e0acc8608a27bd1ff9
parent6c6144b2e8a5c797d8ad6c8b756541fabb6c50db
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c
19 files changed:
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/wcn36xx/smd.c
drivers/net/wireless/brcm80211/Kconfig
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
drivers/net/wireless/mac80211_hwsim.c
net/mac80211/cfg.c
net/mac80211/ibss.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/mac80211/main.c
net/mac80211/mesh.c
net/mac80211/mlme.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c
net/mac80211/scan.c
net/mac80211/util.c
net/wireless/core.c
net/wireless/ibss.c
net/wireless/nl80211.c