diff options
| author | Anusha Srivatsa <anusha.srivatsa@intel.com> | 2018-08-27 17:22:41 -0700 |
|---|---|---|
| committer | Anusha Srivatsa <anusha.srivatsa@intel.com> | 2018-08-27 17:22:41 -0700 |
| commit | d3517f01a130ee5485aaf4f1d5bf4b66626aa1fe (patch) | |
| tree | 067f714a3dfe78e4a4df2b6fe829eea58f9576d6 | |
| parent | 976981cc34b695fa86e55f74c95a5baacfcf7edc (diff) | |
Fix commit.
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
| -rw-r--r-- | WHENCE | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -3630,14 +3630,8 @@ Version: DMC API/ABI ver 1 - release 06 for Cannonlake File: i915/cnl_dmc_ver1_07.bin Version: DMC API/ABI ver 1 - release 07 for Cannonlake -<<<<<<< HEAD -File: i915/icl_dmc_ver1_05.bin -Version: DMC API/ABI ver 1 - release 05 for Icelake - File: i915/icl_dmc_ver1_07.bin Version: DMC API/ABI ver 1 - release 07 for Icelake -======= ->>>>>>> parent of 57ffda2... firmware/icl/dmc: Add DMC v1.05 for Icelake. License: Redistributable. See LICENSE.i915 for details -------------------------------------------------------------------------- |