git.maquefel.me Git - linux.git/commit

author	Johannes Berg <johannes.berg@intel.com>
	Thu, 15 Feb 2024 08:54:45 +0000 (09:54 +0100)
committer	Johannes Berg <johannes.berg@intel.com>
	Thu, 15 Feb 2024 08:56:42 +0000 (09:56 +0100)
commit	cd882e2fb2e63c80367fc984a2155239710e2801
tree	870cc3a731b541d35e181c85c8b63a1cfcfd279d	tree \| snapshot
parent	182094411e29fa76b6651f31fd7b941780a45c56	commit \| diff
parent	b7198383ef2debe748118996f627452281cf27d7	commit \| diff

Merge wireless into wireless-next

There's a conflict already and some upcoming changes
also depend on changes in wireless for being conflict-
free, so pull wireless in to make all that easier.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/net/wireless/intel/iwlwifi/fw/acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/time-event.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history