Merge commit 'a750f4ee10f962640c479aca184fe65f83956295' of git://people.freedesktop.org/~vivijim/linux-firmware-i915

Signed-off-by: Kyle McMartin <kyle@kernel.org>
This commit is contained in:
Kyle McMartin
2015-07-14 17:04:02 -04:00
10 changed files with 66 additions and 0 deletions

24
WHENCE
View File

@@ -2778,6 +2778,7 @@ Licence: Redistributable. See LICENCE.nvidia for details
--------------------------------------------------------------------------
<<<<<<< HEAD
<<<<<<< HEAD
Driver: atusb - ATUSB IEEE 802.15.4 transceiver driver
@@ -2820,3 +2821,26 @@ File: liquidio/lio_410nv_nic.bin
Version: v1.1.9
Licence: Redistributable. See LICENCE.cavium for details
--------------------------------------------------------------------------
Driver: i915 -- Intel Integrated Graphics driver
File: i915/skl_dmc_ver1_04.bin
File: i915/skl_dmc_ver1_16.bin
File: i915/skl_dmc_ver1_18.bin
File: i915/skl_dmc_ver1.bin
Version: DMC API/ABI ver 1 - release 18 for Skylake
File: i915/bxt_dmc_ver1_04.bin
File: i915/bxt_dmc_ver1.bin
Version: DMC API/ABI ver 1 - release 04 for Broxton
File: i915/skl_guc_ver1_1059.bin
File: i915/skl_guc_ver1.bin
Version: Guc API/ABI ver 1 - release 1059 for Skylake
License: Redistributable. See LICENSE.i915 for details