Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Dec 2013 19:25:38 +0000 (14:25 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Dec 2013 19:25:38 +0000 (14:25 -0500)
1  2 
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/regd.c
drivers/net/wireless/brcm80211/brcmfmac/p2p.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwifiex/cfg80211.c
net/mac80211/rate.h
net/mac80211/trace.h
net/wireless/core.h
net/wireless/nl80211.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge