Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next master
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Mar 2015 18:00:23 +0000 (14:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Mar 2015 18:00:23 +0000 (14:00 -0400)
14 files changed:
1  2 
MAINTAINERS
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/cw1200/sta.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwifiex/cfg80211.c
net/mac80211/cfg.c
net/mac80211/ibss.c
net/mac80211/mesh.c
net/mac80211/mlme.c
net/wireless/ibss.c
net/wireless/nl80211.c
net/wireless/trace.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge