summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-03-04 19:05:12 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-03-04 19:05:12 +0100
commitf3b6a488a670f1be2666ab97e31dcfc0b1648884 (patch)
treed8d2431f21d4371c907dec075926e86840e86d1e /drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
parentwil6210: fix smatch warning in wil_cfg80211_get_station() (diff)
parentmwifiex: do not advertise usb autosuspend support (diff)
downloadlinux-f3b6a488a670f1be2666ab97e31dcfc0b1648884.tar.xz
linux-f3b6a488a670f1be2666ab97e31dcfc0b1648884.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c')
0 files changed, 0 insertions, 0 deletions