Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 00:56:29 +0000 (11:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 00:56:29 +0000 (11:56 +1100)
commit39e03d839d825adcb4d36c67dbc063dc169cfa44
tree92d2bd5ea68b995ea28ef72cc7ca3da67a609271
parent5362068a348555b5c599a3c9a1ecb82959dd7a11
parente715f10f3d055939b4cdfcd282ddf13d1dbab7fc
Merge branch 'main' of git git://git./linux/kernel/git/wireless/wireless-next.git

# Conflicts:
# net/mac80211/mlme.c
17 files changed:
drivers/net/wireless/intel/iwlwifi/fw/acpi.c
drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
drivers/net/wireless/intel/iwlwifi/fw/file.h
drivers/net/wireless/intel/iwlwifi/iwl-csr.h
drivers/net/wireless/intel/iwlwifi/iwl-drv.c
drivers/net/wireless/intel/iwlwifi/mei/main.c
drivers/net/wireless/intel/iwlwifi/mei/net.c
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
drivers/net/wireless/intel/iwlwifi/mvm/fw.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
drivers/net/wireless/intel/iwlwifi/mvm/ops.c
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
drivers/net/wireless/intel/iwlwifi/pcie/trans.c
drivers/net/wireless/mac80211_hwsim.c
net/mac80211/mlme.c