diff options
author | Johannes Berg <johannes.berg@intel.com> | 2024-05-06 11:44:58 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2024-05-06 16:32:51 +0200 |
commit | 2f324144e075e135991ecad073653176a8dfd000 (patch) | |
tree | 5e20f4a693a7449a1ac5eed6fde00ecb4981c6a4 /block/blk-mq-debugfs-zoned.c | |
parent | 2d6c7177605622aa8650fd012effced921936f83 (diff) | |
parent | 838c7b8f1f278404d9d684c34a8cb26dc41aaaa1 (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>
Diffstat (limited to 'block/blk-mq-debugfs-zoned.c')
0 files changed, 0 insertions, 0 deletions