-
- Downloads
Stephen Rothwell reported quite a few conflicts in iwlwifi between wireless-drivers and wireless-drivers-next. To avoid any problems later in other trees merge w-d to w-d-next to fix those conflicts early.
Showing
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c 4 additions, 2 deletionsdrivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
- drivers/net/wireless/intel/iwlwifi/cfg/9000.c 7 additions, 7 deletionsdrivers/net/wireless/intel/iwlwifi/cfg/9000.c
- drivers/net/wireless/intel/iwlwifi/fw/file.h 2 additions, 0 deletionsdrivers/net/wireless/intel/iwlwifi/fw/file.h
- drivers/net/wireless/intel/iwlwifi/iwl-config.h 4 additions, 4 deletionsdrivers/net/wireless/intel/iwlwifi/iwl-config.h
- drivers/net/wireless/intel/iwlwifi/iwl-drv.c 3 additions, 2 deletionsdrivers/net/wireless/intel/iwlwifi/iwl-drv.c
- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 10 additions, 7 deletionsdrivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
- drivers/net/wireless/intel/iwlwifi/mvm/fw.c 4 additions, 2 deletionsdrivers/net/wireless/intel/iwlwifi/mvm/fw.c
- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 11 additions, 1 deletiondrivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
- drivers/net/wireless/intel/iwlwifi/mvm/rs.c 4 additions, 5 deletionsdrivers/net/wireless/intel/iwlwifi/mvm/rs.c
- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 6 additions, 6 deletionsdrivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
- drivers/net/wireless/intel/iwlwifi/mvm/sta.c 4 additions, 3 deletionsdrivers/net/wireless/intel/iwlwifi/mvm/sta.c
- drivers/net/wireless/intel/iwlwifi/mvm/tx.c 10 additions, 2 deletionsdrivers/net/wireless/intel/iwlwifi/mvm/tx.c
- drivers/net/wireless/intel/iwlwifi/pcie/drv.c 20 additions, 0 deletionsdrivers/net/wireless/intel/iwlwifi/pcie/drv.c
- include/net/mac80211.h 15 additions, 0 deletionsinclude/net/mac80211.h
- net/mac80211/agg-rx.c 21 additions, 1 deletionnet/mac80211/agg-rx.c
Loading
Please register or sign in to comment