Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless...
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Feb 2022 00:08:14 +0000 (11:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Feb 2022 00:08:14 +0000 (11:08 +1100)
commit0afc398c137dede0cffae3ae96649c514dab809b
tree1808c1307044213d8262eaf98a22d507826b479d
parentd6b1af5932b1a063dd59aacc171a462e0caf98cd
parentea0de861374b06f97620eb508d442161b56cfa62
Merge branch 'main' of git git://git./linux/kernel/git/wireless/wireless-next.git

# Conflicts:
# net/mac80211/mlme.c
drivers/net/wireless/intel/iwlwifi/mvm/ops.c
drivers/net/wireless/mac80211_hwsim.c
net/mac80211/mlme.c