tree 5cb66fde6b5abbc506ebe986439ce7d91b8faf5d
parent e935698a7ad7a94e2fedb8f2be92002455eacf70
author developer <developer@mediatek.com> 1657598361 +0800
committer developer <developer@mediatek.com> 1657602469 +0800

[][MAC80211][Fix patch conflicts]

[Description]
Fix patch conflicts

[Release-log]
N/A

Change-Id: Ifc218967eaaade387bcca391a09d0ff582fcbad3
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6236471