Merge branch 'master' of git://dev.laptop.org/users/dsd/linux-firmware

2012-09-09 20:04:28 +01:00 · 2012-09-09 20:04:28 +01:00 · a707c25a6e
parent adb6547d1f bac3567cdb
commit a707c25a6e
3 changed files with 3 additions and 3 deletions
--- a/6
+++ b/6
@ -713,10 +713,10 @@ directly by Marvell.
 Driver: mwifiex - Marvell Wi-Fi fullmac-type 802.11n card

 File: mrvl/sd8787_uapsta.bin
-Version: 14.57.5.p44
+Version: 14.66.9.p96

-Licence: Redistributable. See LICENCE.Marvell for details.  Extracted from
-Linux driver tarballs downloaded from Marvell's "Extranet" with permission.
+Licence: Redistributable. See LICENCE.Marvell for details.  Originates from
+http://git.marvell.com/?p=mwifiex-firmware.git

 --------------------------------------------------------------------------

--- a/libertas/sd8686_v9.bin
+++ b/libertas/sd8686_v9.bin
--- a/mrvl/sd8787_uapsta.bin
+++ b/mrvl/sd8787_uapsta.bin