From: Johannes Berg Date: Thu, 8 Feb 2024 08:57:43 +0000 (+0100) Subject: Merge wireless into wireless-next X-Git-Tag: v6.9-rc1~159^2~210^2~150 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af4acac7caa17cf10742c80e2dd859e21d06abb9;p=thirdparty%2Fkernel%2Flinux.git Merge wireless into wireless-next There are some changes coming to wireless-next that will otherwise cause conflicts, pull wireless in first to be able to resolve that when applying the individual changes rather than having to do merge resolution later. Signed-off-by: Johannes Berg --- af4acac7caa17cf10742c80e2dd859e21d06abb9