Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

The series "[PATCH 0/2] mt76x0: initialize per-channel max_power" depends on
commit d04ca383860b ("mt76x0u: fix suspend/resume"), so merge wireless-drivers
into wireless-drivers-next to get that.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/core.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index f66e1b2f0980ca380b73c41ced936659f08890be,a5ea3ba495a4d601bdbb71bcc47ef436f31a60b4..3987adaaf2bda1f420775510f264763f3ba61701
--- 1/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
--- 2/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@@ -155,27 -155,17 +155,17 @@@ static const struct ieee80211_ops mt76x
        .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,
        .set_rts_threshold = mt76x02_set_rts_threshold,
        .wake_tx_queue = mt76_wake_tx_queue,
 -      .get_txpower = mt76x02_get_txpower,
 +      .get_txpower = mt76_get_txpower,
  };
  
- static int mt76x0u_register_device(struct mt76x02_dev *dev)
+ static int mt76x0u_init_hardware(struct mt76x02_dev *dev)
  {
-       struct ieee80211_hw *hw = dev->mt76.hw;
        int err;
  
-       err = mt76u_alloc_queues(&dev->mt76);
-       if (err < 0)
-               goto out_err;
- 
-       err = mt76u_mcu_init_rx(&dev->mt76);
-       if (err < 0)
-               goto out_err;
- 
        mt76x0_chip_onoff(dev, true, true);
-       if (!mt76x02_wait_for_mac(&dev->mt76)) {
-               err = -ETIMEDOUT;
-               goto out_err;
-       }
+ 
+       if (!mt76x02_wait_for_mac(&dev->mt76))
+               return -ETIMEDOUT;
  
        err = mt76x0u_mcu_init(dev);
        if (err < 0)