aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@kernel.org>2018-05-07 09:09:40 -0400
committerJosh Boyer <jwboyer@kernel.org>2018-05-07 09:09:40 -0400
commit8fc2d4e55685bf73b6f7752383da9067404a74bb (patch)
treecb9c3e6518e08b669e1810d8c3054f13ca6308ef
parent0686ec7495dada1dc3df07f4e12502f713a210e2 (diff)
parente1abab618308110789a4c27db543d132fd62e89f (diff)
downloadlinux-firmware-8fc2d4e55685bf73b6f7752383da9067404a74bb.tar.gz
Merge git://git.marvell.com/mwifiex-firmware
Signed-off-by: Josh Boyer <jwboyer@kernel.org>
-rw-r--r--WHENCE4
-rw-r--r--mrvl/sd8897_uapsta.binbin814048 -> 821024 bytes
-rw-r--r--mrvl/usbusb8997_combo_v4.binbin602100 -> 604536 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/WHENCE b/WHENCE
index f843f7f1..b360a49a 100644
--- a/WHENCE
+++ b/WHENCE
@@ -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
diff --git a/mrvl/sd8897_uapsta.bin b/mrvl/sd8897_uapsta.bin
index 1c7b270b..a2317ae8 100644
--- a/mrvl/sd8897_uapsta.bin
+++ b/mrvl/sd8897_uapsta.bin
Binary files differ
diff --git a/mrvl/usbusb8997_combo_v4.bin b/mrvl/usbusb8997_combo_v4.bin
index 08e2310c..5b697ced 100644
--- a/mrvl/usbusb8997_combo_v4.bin
+++ b/mrvl/usbusb8997_combo_v4.bin
Binary files differ