diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-08 11:57:43 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-02-08 11:58:25 +0300 |
| commit | af4acac7caa17cf10742c80e2dd859e21d06abb9 (patch) | |
| tree | 650468891990d2f8edc6726aab697ff35d8b9673 /scripts | |
| parent | 94dd7ce1885e530a7b10bbe50d5d68ba1bb99e6e (diff) | |
| parent | 0647903efbc84b772325b4d24d9487e24d6d1e03 (diff) | |
| download | linux-af4acac7caa17cf10742c80e2dd859e21d06abb9.tar.xz | |
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 <johannes.berg@intel.com>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions