aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@kernel.org>2017-05-11 12:30:22 -0400
committerKyle McMartin <kyle@kernel.org>2017-05-11 12:30:46 -0400
commitbbcc178066926b470d31dc7eaba12bb3199fff73 (patch)
tree982f359bd09093a2733f7dd3993dac279f6024b6
parent766da91d4831792540451403ad349e2ece368f84 (diff)
parent47afd9950fbcadeb7cefc093b21d6123bdc76f79 (diff)
downloadfirmware-bbcc178066926b470d31dc7eaba12bb3199fff73.tar.gz
Merge '47afd99' from git://git.marvell.com/mwifiex-firmware
-rw-r--r--WHENCE3
-rw-r--r--mrvl/usbusb8997_combo_v4.binbin0 -> 602100 bytes
2 files changed, 3 insertions, 0 deletions
diff --git a/WHENCE b/WHENCE
index d71013b0..56d257d2 100644
--- a/WHENCE
+++ b/WHENCE
@@ -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
diff --git a/mrvl/usbusb8997_combo_v4.bin b/mrvl/usbusb8997_combo_v4.bin
new file mode 100644
index 00000000..08e2310c
--- /dev/null
+++ b/mrvl/usbusb8997_combo_v4.bin
Binary files differ