From: Olof Johansson <olof@lixom.net>
Date: Tue, 11 Feb 2020 22:49:06 +0000 (-0800)
Subject: Merge tag 'sunxi-config64-for-5.6-2' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~4353^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0eaa9fc1d7f4d36fdf5e32808a412a55d08e7ace;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'sunxi-config64-for-5.6-2' of https://git./linux/kernel/git/sunxi/linux into arm/fixes

Two patches to enable the new thermal sensor driver found on newer
Allwinner SoCs and to enable the MIPI-DSI controller.

* tag 'sunxi-config64-for-5.6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: defconfig: Enable DRM_SUN6I_DSI
  arm64: defconfig: Enable CONFIG_SUN8I_THERMAL

Link: https://lore.kernel.org/r/283eb531-890f-4ab2-95b5-898301af9807.lettre@localhost
Signed-off-by: Olof Johansson <olof@lixom.net>
---

0eaa9fc1d7f4d36fdf5e32808a412a55d08e7ace