kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-13 07:31:07 +00:00
Code Issues Releases Packages Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

Browse source 
Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.
This commit is contained in:
Kalle Valo 2017-10-16 17:06:54 +03:00
commit 0fac9e2dff
32 changed files with 363 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/wireless/ath/ath10k/pci.c
View file

37
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
View file

3
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
View file

5
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
View file

197
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
View file

1
drivers/net/wireless/intel/iwlwifi/cfg/7000.c
View file

2
drivers/net/wireless/intel/iwlwifi/cfg/8000.c
View file

2
drivers/net/wireless/intel/iwlwifi/cfg/9000.c
View file

2
drivers/net/wireless/intel/iwlwifi/cfg/a000.c
View file

2
drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
View file

7
drivers/net/wireless/intel/iwlwifi/fw/dbg.c
View file

15
drivers/net/wireless/intel/iwlwifi/fw/dbg.h
View file

16
drivers/net/wireless/intel/iwlwifi/iwl-config.h
View file

142
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
View file

2
drivers/net/wireless/intel/iwlwifi/mvm/d3.c
View file

69
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
View file

5
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
View file

21
drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
View file

3
drivers/net/wireless/intel/iwlwifi/mvm/rs.c
View file

4
drivers/net/wireless/intel/iwlwifi/mvm/rx.c
View file

11
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
View file

2
drivers/net/wireless/intel/iwlwifi/mvm/scan.c
View file

8
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
View file

2
drivers/net/wireless/intel/iwlwifi/mvm/sta.h
View file

3
drivers/net/wireless/intel/iwlwifi/mvm/tt.c
View file

10
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
View file

9
drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
View file

3
drivers/net/wireless/quantenna/qtnfmac/cfg80211.h
View file

2
drivers/net/wireless/quantenna/qtnfmac/event.c
View file

9
drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c
View file

2
drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_bus_priv.h
View file

2
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
View file