Merge branch 'master' of git://git.marvell.com/mwifiex-firmware

Signed-off-by: Kyle McMartin <kyle@kernel.org>
2016-01-10 12:09:51 -08:00 · 2016-01-10 12:09:51 -08:00 · f7c7657b9b
parent 0555ae0ffc e92f8b3f65
commit f7c7657b9b
6 changed files with 9 additions and 3 deletions
--- a/12
+++ b/12
@ -737,20 +737,26 @@ File: mrvl/sd8797_uapsta.bin
 Version: 14.66.11.p151

 File: mrvl/usb8797_uapsta.bin
-Version: 14.68.29.p38
+Version: 14.68.29.p49

 File: mrvl/sd8897_uapsta.bin
-Version: 15.68.4.p112
+Version: 15.68.7.p53

 File: mrvl/usb8897_uapsta.bin
 Version: 15.68.4.p103

 File: mrvl/pcie8897_uapsta.bin
-Version: 15.68.4.p112
+Version: 15.68.7.p53

 File: mrvl/sd8887_uapsta.bin
 Version: 15.68.7.p5

+File: mrvl/sd8801_uapsta.bin
+Version: 14.68.36.p60
+
+File: mrvl/usb8801_uapsta.bin
+Version: 14.68.36.p60
+
 Licence: Redistributable. See LICENCE.Marvell for details.  Originates from
 http://git.marvell.com/?p=mwifiex-firmware.git

--- a/mrvl/pcie8897_uapsta.bin
+++ b/mrvl/pcie8897_uapsta.bin
--- a/mrvl/sd8801_uapsta.bin
+++ b/mrvl/sd8801_uapsta.bin
--- a/mrvl/sd8897_uapsta.bin
+++ b/mrvl/sd8897_uapsta.bin
--- a/mrvl/usb8797_uapsta.bin
+++ b/mrvl/usb8797_uapsta.bin
--- a/mrvl/usb8801_uapsta.bin
+++ b/mrvl/usb8801_uapsta.bin