Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
authorKalle Valo <kvalo@codeaurora.org>
Tue, 4 Aug 2020 11:02:54 +0000 (14:02 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 4 Aug 2020 11:02:54 +0000 (14:02 +0300)
commit2cfd71f1a43e9e1053db6c84f2dc33fe88128f67
tree777ad43d30e00597687256da0d5a1f966df99f3e
parent3dc05ffb04436020f63138186dbc4f37bd938552
parent1cfd3426ef989b83fa6176490a38777057e57f6c
Merge git://git./linux/kernel/git/kvalo/wireless-drivers.git

mt76 driver had major conflicts within mt7615 directory. To make it easier for
every merge wireless-drivers to wireless-drivers-next and solve those
conflicts.
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
drivers/net/wireless/mediatek/mt76/mt7615/usb.c
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
drivers/net/wireless/mediatek/mt76/usb.c