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

[Also fix up the permissions on pcie8997_wlan_v4.bin]
8 years ago · e39f0e3e68
4 changed files with 5 additions and 2 deletions
--- a/7
+++ b/7
@ -742,7 +742,7 @@ File: mrvl/usb8797_uapsta.bin
				@@ -742,7 +742,7 @@ File: mrvl/usb8797_uapsta.bin
 Version: 14.68.29.p49

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

 File: mrvl/usb8897_uapsta.bin
 Version: 15.68.4.p103
@ -763,7 +763,10 @@ File: mrvl/pcieuart8997_combo_v4.bin
				@@ -763,7 +763,10 @@ File: mrvl/pcieuart8997_combo_v4.bin
 Version: 16.68.1.p70

 File: mrvl/pcieusb8997_combo_v4.bin
-Version: 16.68.1.p70
+Version: 16.68.1.p97
+
+File: mrvl/pcie8997_wlan_v4.bin
+Version: 16.68.1.p97

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