Merge branch 'dev-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/firmware

Signed-off-by: Josh Boyer <jwboyer@kernel.org>
This commit is contained in:
Josh Boyer 2019-10-04 18:45:09 -04:00
commit 4c55b9793d
No known key found for this signature in database
GPG Key ID: A31B6BD72486CFD6
4 changed files with 49 additions and 0 deletions

39
LICENSE.ice Normal file
View File

@ -0,0 +1,39 @@
Copyright (c) 2019, Intel Corporation.
All rights reserved.
Redistribution. Redistribution and use in binary form, without
modification, are permitted provided that the following conditions are
met:
* Redistributions must reproduce the above copyright notice and the
following disclaimer in the documentation and/or other materials
provided with the distribution.
* Neither the name of Intel Corporation nor the names of its suppliers
may be used to endorse or promote products derived from this software
without specific prior written permission.
* No reverse engineering, decompilation, or disassembly of this software
is permitted.
Limited patent license. Intel Corporation grants a world-wide,
royalty-free, non-exclusive license under patents it now or hereafter
owns or controls to make, have made, use, import, offer to sell and
sell ("Utilize") this software, but solely to the extent that any
such patent is necessary to Utilize the software alone, or in
combination with an operating system licensed under an approved Open
Source license as listed by the Open Source Initiative at
http://opensource.org/licenses. The patent license shall not apply to
any other combinations which include this software. No hardware per
se is licensed hereunder.
DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.

9
WHENCE
View File

@ -4588,3 +4588,12 @@ File: meson/vdec/gxl_mpeg4_5.bin
File: meson/vdec/gxm_h264.bin
Licence: Redistributable. See LICENSE.amlogic_vdec for details.
--------------------------------------------------------------------------
Driver: ice - Intel(R) Ethernet Connection E800 Series
File: intel/ice/ddp/ice-1.3.4.0.pkg
Link: intel/ice/ddp/ice.pkg -> intel/ice/ddp/ice-1.3.4.0.pkg
License: Redistributable. See LICENSE.ice for details

Binary file not shown.

1
intel/ice/ddp/ice.pkg Symbolic link
View File

@ -0,0 +1 @@
ice-1.3.4.0.pkg