diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2019-05-28 11:07:59 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-05-28 11:07:59 +0300 |
| commit | 2491b544ff3aa9717d427033206fa793be53429d (patch) | |
| tree | 71b5fc8897495a791519ece54c14f81484c48ae9 /drivers/staging/most/dim2/errors.h | |
| parent | b27e35ae5b1804078cfd177082429eea9de01885 (diff) | |
| parent | 14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff) | |
Merge drm/drm-next into drm-intel-next-queued
Get the HDR dependencies originally merged via drm-misc. Sync up all
i915 changes applied via other trees. And get v5.2-rc2 as the baseline.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/staging/most/dim2/errors.h')
| -rw-r--r-- | drivers/staging/most/dim2/errors.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/most/dim2/errors.h b/drivers/staging/most/dim2/errors.h index 3487510fbd2f..268332e5735e 100644 --- a/drivers/staging/most/dim2/errors.h +++ b/drivers/staging/most/dim2/errors.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 */ /* * errors.h - Definitions of errors for DIM2 HAL API * (MediaLB, Device Interface Macro IP, OS62420) |