]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit449455a8a8f2ccf8fb971b778508a0bbdd3d3d7e
tree777ad43d30e00597687256da0d5a1f966df99f3e
parent42a5e41fc69e6985cd12165f2ff2fcfedad87114
parent69b9f50aee7e7cd7467459d3814ef187532e0313
Merge git://git.kernel.org/pub/scm/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