Unverified Commit d1e743dd authored by Josh Boyer's avatar Josh Boyer
Browse files

Merge branch 'master' of https://github.com/NXP/mwifiex-firmware


Signed-off-by: default avatarJosh Boyer <jwboyer@kernel.org>
parents 6871bffa e65245cc
Copyright © 2019. NXP B.V. All rights reserved.
Redistribution and use in binary form is permitted provided that the following
conditions are met:
1. Redistributions must reproduce the above copyright notice, this list of
conditions and the following disclaimer in the documentation and/or other
materials provided with the distribution.
2. Redistribution and use shall be used only with NXP B.V. silicon products.
Any other use, reproduction, modification, translation, or compilation of the
Software is prohibited.
3. No reverse engineering, decompilation, or disassembly is permitted.
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED
"AS IS" WITHOUT WARRANTY OF ANY KIND, INCLUDING, WITHOUT LIMITATION, ANY EXPRESS
OR IMPLIED WARRANTIES OF MERCHANTABILITY, ACCURACY, FITNESS OR SUFFICIENCY FOR A
PARTICULAR PURPOSE, SATISFACTORY QUALITY, CORRESPONDENCE WITH DESCRIPTION, QUIET
ENJOYMENT OR NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS.
NXP B.V., ITS AFFILIATES AND THEIR SUPPLIERS DISCLAIM ANY WARRANTY THAT THE
DELIVERABLES WILL OPERATE WITHOUT INTERRUPTION OR BE ERROR-FREE.
...@@ -793,8 +793,8 @@ Version: W16.68.1.p179 ...@@ -793,8 +793,8 @@ Version: W16.68.1.p179
File: mrvl/sdsd8977_combo_v2.bin File: mrvl/sdsd8977_combo_v2.bin
Version: W16.68.1.p195 Version: W16.68.1.p195
Licence: Redistributable. See LICENCE.Marvell for details. Originates from Licence: Redistributable. See LICENCE.NXP for details. Originates from
http://git.marvell.com/?p=mwifiex-firmware.git https://github.com/NXP/mwifiex-firmware.git
-------------------------------------------------------------------------- --------------------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment