Merge wireless-drivers into wireless-drivers-next
authorKalle Valo <kvalo@codeaurora.org>
Mon, 17 Sep 2018 14:41:02 +0000 (17:41 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 17 Sep 2018 14:41:02 +0000 (17:41 +0300)
commit43e2f2904160b9a95aad77df9cbc1622910b8598
treed2608ffbd2488b0d1e6dbeaad7bc489fe452ad3a
parentcf5652c962dae3bff1e256be7eba142b067e74ba
parent3341ba9f0f2637a51738ef5de5114e13a1cd3eca
Merge wireless-drivers into wireless-drivers-next

Solve the conflict in main.c early on as there will be a lot more mt76 patches
in the queue.
drivers/net/wireless/mediatek/mt76/mt76x0/main.c