From: Dave Airlie <airlied@redhat.com>
Date: Thu, 8 Dec 2016 00:35:52 +0000 (+1000)
Subject: Merge tag 'meson-drm-for-4.10' of github.com:superna9999/linux into drm-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e783fd0cdc749716155ddebff660a98236f23f97;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'meson-drm-for-4.10' of github.com:superna9999/linux into drm-next

Add support for the Amlogic Meson Video Processing Unit
- Only CVBS/Composite output for Amlogic Meson GXBB/GXL/GXM SoCs
- Add MAINTAINERS entry
- Add DT bindings documentation

* tag 'meson-drm-for-4.10' of github.com:superna9999/linux:
  MAINTAINERS: add entry for Amlogic DRM drivers
  dt-bindings: display: add Amlogic Meson DRM Bindings
  drm: Add support for Amlogic Meson Graphic Controller
---

e783fd0cdc749716155ddebff660a98236f23f97
diff --cc drivers/gpu/drm/Kconfig
index 726d5127f449,344ced6483f2..ebfe8404c25f
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@@ -238,10 -223,8 +238,12 @@@ source "drivers/gpu/drm/hisilicon/Kconf
  
  source "drivers/gpu/drm/mediatek/Kconfig"
  
 +source "drivers/gpu/drm/zte/Kconfig"
 +
 +source "drivers/gpu/drm/mxsfb/Kconfig"
 +
+ source "drivers/gpu/drm/meson/Kconfig"
+ 
  # Keep legacy drivers last
  
  menuconfig DRM_LEGACY