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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/Kconfig
index 726d5127f44916bf395db878114f87cf3e76c32a,344ced6483f2cbb7fb5120a87f16075d0d7d1cef..ebfe8404c25ff1971fdd705545f589a53a56575e
--- 1/drivers/gpu/drm/Kconfig
--- 2/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

diff --cc drivers/gpu/drm/Makefile
Simple merge