Merge remote-tracking branch 'drm/drm-next'

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/configs/exynos_defconfig
Simple merge

diff --cc arch/arm/configs/multi_v7_defconfig
index c1b8a6d,6413390..943780b
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -440,11 -429,8 +440,11 @@@ CONFIG_VIDEO_RENESAS_VSP1=
  CONFIG_VIDEO_ADV7180=m
  CONFIG_VIDEO_ML86V7667=m
  CONFIG_DRM=y
- CONFIG_DRM_PTN3460=m
- CONFIG_DRM_PS8622=m
 +# CONFIG_DRM_I2C_CH7006 is not set
 +# CONFIG_DRM_I2C_SIL164 is not set
+ CONFIG_DRM_NXP_PTN3460=m
+ CONFIG_DRM_PARADE_PS8622=m
 +CONFIG_DRM_NOUVEAU=m
  CONFIG_DRM_EXYNOS=m
  CONFIG_DRM_EXYNOS_DSI=y
  CONFIG_DRM_EXYNOS_FIMD=y

diff --cc drivers/gpu/drm/exynos/Kconfig
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_g2d.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_irq.c
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge