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

Signed-off-by: Josh Boyer <jwboyer@kernel.org>
7 years ago · 1ab9095735
2 changed files with 3 additions and 0 deletions
--- a/3
+++ b/3
@ -779,6 +779,9 @@ Version: 16.68.1.p97
 File: mrvl/usbusb8997_combo_v4.bin
 Version: V16.68.1.p162
 File: mrvl/sdsd8997_combo_v4.bin
 Version: W16.68.1.p179
 Licence: Redistributable. See LICENCE.Marvell for details.  Originates from
 http://git.marvell.com/?p=mwifiex-firmware.git
--- a/mrvl/sdsd8997_combo_v4.bin
+++ b/mrvl/sdsd8997_combo_v4.bin