Merge git://git.marvell.com/mwifiex-firmware

Signed-off-by: Josh Boyer <jwboyer@kernel.org>
2018-05-07 09:09:40 -04:00 · 2018-05-07 09:09:40 -04:00 · 8fc2d4e556
parent 0686ec7495 e1abab6183
commit 8fc2d4e556
3 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -750,7 +750,7 @@ File: mrvl/usb8797_uapsta.bin
 Version: 14.68.29.p49

 File: mrvl/sd8897_uapsta.bin
-Version: 15.68.7.p87
+Version: V15.68.7.154

 File: mrvl/usb8897_uapsta.bin
 Version: 15.68.4.p103
@ -777,7 +777,7 @@ File: mrvl/pcie8997_wlan_v4.bin
 Version: 16.68.1.p97

 File: mrvl/usbusb8997_combo_v4.bin
-Version: 16.68.1.p113
+Version: V16.68.1.p162

 Licence: Redistributable. See LICENCE.Marvell for details.  Originates from
 http://git.marvell.com/?p=mwifiex-firmware.git
--- a/mrvl/sd8897_uapsta.bin
+++ b/mrvl/sd8897_uapsta.bin
--- a/mrvl/usbusb8997_combo_v4.bin
+++ b/mrvl/usbusb8997_combo_v4.bin