projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2d6c717 838c7b8)
Merge wireless into wireless-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 6 May 2024 09:44:58 +0000 (11:44 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 6 May 2024 14:32:51 +0000 (16:32 +0200)
commit2f324144e075e135991ecad073653176a8dfd000
tree5e20f4a693a7449a1ac5eed6fde00ecb4981c6a4tree | snapshot
parent2d6c7177605622aa8650fd012effced921936f83commit | diff
parent838c7b8f1f278404d9d684c34a8cb26dc41aaaa1commit | diff
Merge wireless into wireless-next

Given how late we are in the cycle, merge the two fixes from
wireless into wireless-next as they don't see that urgent.
This way, the wireless tree won't need rebasing later.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/iwl-drv.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git