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

Signed-off-by: Kyle McMartin <kyle@kernel.org>
2016-03-18 21:07:29 -07:00 · 2016-03-18 21:07:29 -07:00 · f6cd3d818d
parent fa9baa035c 0a0c97667d
commit f6cd3d818d
3 changed files with 5 additions and 0 deletions
--- a/4
+++ b/4
@ -3067,6 +3067,10 @@ Version: Guc API/ABI ver 1 - release 1059 for Skylake
 File: i915/skl_guc_ver4.bin
 Version: Guc API/ABI ver 4 - release 3 for Skylake

+File: i915/skl_guc_ver6_1.bin
+File: i915/skl_guc_ver6.bin
+Version: Guc API/ABI ver 6 - release 1 for Skylake
+
 License: Redistributable. See LICENSE.i915 for details

 --------------------------------------------------------------------------
--- a/i915/skl_guc_ver6.bin
+++ b/i915/skl_guc_ver6.bin
@ -0,0 +1 @@
+skl_guc_ver6_1.bin
--- a/i915/skl_guc_ver6_1.bin
+++ b/i915/skl_guc_ver6_1.bin