aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2017-11-23 13:57:38 +0000
committerBen Hutchings <ben@decadent.org.uk>2017-11-23 13:57:38 +0000
commit90436ce9f11152483b35aac58dec7f99d52821aa (patch)
tree2122b21213e5b20c155451deb5fa6f75bab82882
parent8e864c2c8d98fc378202090a08f343c355f4e144 (diff)
parentdb3e1855ea46bc1a22b8bbecb400c2909c551cf5 (diff)
downloadfirmware-90436ce9f11152483b35aac58dec7f99d52821aa.tar.gz
Merge branch 'master' of git://git.marvell.com/mwifiex-firmware
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--WHENCE4
-rw-r--r--mrvl/pcie8897_uapsta.binbin820212 -> 836540 bytes
-rw-r--r--mrvl/pcieusb8997_combo_v4.binbin597136 -> 622532 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/WHENCE b/WHENCE
index 138440f1..9ce1ae7e 100644
--- a/WHENCE
+++ b/WHENCE
@@ -748,7 +748,7 @@ File: mrvl/usb8897_uapsta.bin
Version: 15.68.4.p103
File: mrvl/pcie8897_uapsta.bin
-Version: 15.68.7.p77
+Version: 15.68.7.p119
File: mrvl/sd8887_uapsta.bin
Version: 15.68.7.p112
@@ -763,7 +763,7 @@ File: mrvl/pcieuart8997_combo_v4.bin
Version: 16.68.1.p70
File: mrvl/pcieusb8997_combo_v4.bin
-Version: 16.68.1.p97
+Version: 16.68.1.p140
File: mrvl/pcie8997_wlan_v4.bin
Version: 16.68.1.p97
diff --git a/mrvl/pcie8897_uapsta.bin b/mrvl/pcie8897_uapsta.bin
index c7316862..f91003b1 100644
--- a/mrvl/pcie8897_uapsta.bin
+++ b/mrvl/pcie8897_uapsta.bin
Binary files differ
diff --git a/mrvl/pcieusb8997_combo_v4.bin b/mrvl/pcieusb8997_combo_v4.bin
index adc8f925..909733db 100644
--- a/mrvl/pcieusb8997_combo_v4.bin
+++ b/mrvl/pcieusb8997_combo_v4.bin
Binary files differ