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

This commit is contained in:
Ben Hutchings 2012-09-09 20:04:28 +01:00
commit a707c25a6e
3 changed files with 3 additions and 3 deletions

6
WHENCE
View File

@ -713,10 +713,10 @@ directly by Marvell.
Driver: mwifiex - Marvell Wi-Fi fullmac-type 802.11n card Driver: mwifiex - Marvell Wi-Fi fullmac-type 802.11n card
File: mrvl/sd8787_uapsta.bin File: mrvl/sd8787_uapsta.bin
Version: 14.57.5.p44 Version: 14.66.9.p96
Licence: Redistributable. See LICENCE.Marvell for details. Extracted from Licence: Redistributable. See LICENCE.Marvell for details. Originates from
Linux driver tarballs downloaded from Marvell's "Extranet" with permission. http://git.marvell.com/?p=mwifiex-firmware.git
-------------------------------------------------------------------------- --------------------------------------------------------------------------

Binary file not shown.

Binary file not shown.