Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Dec 2014 18:58:58 +0000 (13:58 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Dec 2014 18:58:58 +0000 (13:58 -0500)
1  2 
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/brcm80211/brcmfmac/of.c
drivers/net/wireless/brcm80211/brcmfmac/pcie.c
drivers/net/wireless/brcm80211/brcmfmac/usb.c
net/mac80211/rc80211_minstrel_ht.c

Simple merge
Simple merge