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/clk/meson/Kconfig | |
parent | b27e35ae5b1804078cfd177082429eea9de01885 (diff) | |
parent | 14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff) | |
download | linux-2491b544ff3aa9717d427033206fa793be53429d.tar.xz |
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/clk/meson/Kconfig')
-rw-r--r-- | drivers/clk/meson/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig index 3858747f5438..a6b20e123e0c 100644 --- a/drivers/clk/meson/Kconfig +++ b/drivers/clk/meson/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config COMMON_CLK_MESON_INPUT tristate |