Merge '47afd99' from git://git.marvell.com/mwifiex-firmware

2017-05-11 12:30:22 -04:00 · 2017-05-11 12:30:22 -04:00 · bbcc178066
parent 766da91d48 47afd9950f
commit bbcc178066
2 changed files with 3 additions and 0 deletions
--- a/3
+++ b/3
@ -768,6 +768,9 @@ Version: 16.68.1.p97
 File: mrvl/pcie8997_wlan_v4.bin
 Version: 16.68.1.p97

+File: mrvl/usbusb8997_combo_v4.bin
+Version: 16.68.1.p113
+
 Licence: Redistributable. See LICENCE.Marvell for details.  Originates from
 http://git.marvell.com/?p=mwifiex-firmware.git

--- a/mrvl/usbusb8997_combo_v4.bin
+++ b/mrvl/usbusb8997_combo_v4.bin