aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2012-09-09 20:04:28 +0100
committerBen Hutchings <ben@decadent.org.uk>2012-09-09 20:04:28 +0100
commita707c25a6e992b8ee6127a6ebab63dd063043047 (patch)
tree8799b55f9710b71e28b8bae38d69edbd963422d8
parentadb6547d1f9f4c0363c55733acb7afee6286928a (diff)
parentbac3567cdb38d5cfcf3045718618026d60478d05 (diff)
downloadlinux-firmware-a707c25a6e992b8ee6127a6ebab63dd063043047.tar.gz
Merge branch 'master' of git://dev.laptop.org/users/dsd/linux-firmware
-rw-r--r--WHENCE6
-rw-r--r--libertas/sd8686_v9.binbin124188 -> 124252 bytes
-rw-r--r--mrvl/sd8787_uapsta.binbin354796 -> 447384 bytes
3 files changed, 3 insertions, 3 deletions
diff --git a/WHENCE b/WHENCE
index ce77f840..eb66e5c9 100644
--- a/WHENCE
+++ b/WHENCE
@@ -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
--------------------------------------------------------------------------
diff --git a/libertas/sd8686_v9.bin b/libertas/sd8686_v9.bin
index 5cada25e..757c6f24 100644
--- a/libertas/sd8686_v9.bin
+++ b/libertas/sd8686_v9.bin
Binary files differ
diff --git a/mrvl/sd8787_uapsta.bin b/mrvl/sd8787_uapsta.bin
index 45d9f030..3bf4e230 100644
--- a/mrvl/sd8787_uapsta.bin
+++ b/mrvl/sd8787_uapsta.bin
Binary files differ