Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 7 Oct 2014 18:48:29 +0000 (14:48 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 7 Oct 2014 18:48:29 +0000 (14:48 -0400)
commitd7ffd588f00ef2d9d0f3acc569ddbaebe5c4f8c3
tree76c1fe931f6b1e6e9f29d25d887791f00d6b6ed7
parent3f08e47291879fb047d7d4464d2beaedfea4eb63
parentf8adaf0ae978252c9f7e29e96aefcd8fcaf806ba
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
net/mac80211/sta_info.c
net/wireless/nl80211.c