Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Aug 2013 18:24:51 +0000 (14:24 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Aug 2013 18:24:51 +0000 (14:24 -0400)
commitd0746663667f37e7be5646bf68cb452c8375a23d
tree85ae5a3d5e5bae53815baba5dba372e4d53a9745
parent41caa760d6acaf47cbd44c3d78307fb9be089111
parent27b3eb9c06a7193bdc9800cd00764a130343bc8a
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/iwlwifi/mvm/tx.c
net/mac80211/cfg.c
net/mac80211/mlme.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c
net/wireless/nl80211.c