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

Conflicts:
	drivers/gpu/drm/tegra/Kconfig

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/gpu/drm/drm_crtc_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/tegra/Kconfig
index 0f36ddd74e87ccc317924ee617f8c1150d86ed83,0f711424e69082b9a302a1212fb59119c7384060..da34dd1b9ddbb062996849a0b7f42b59755aaabc
--- 1/drivers/gpu/host1x/drm/Kconfig
--- 2/drivers/gpu/drm/tegra/Kconfig
+++ b/drivers/gpu/drm/tegra/Kconfig
@@@ -1,8 -1,10 +1,11 @@@
  config DRM_TEGRA
        bool "NVIDIA Tegra DRM"
+       depends on ARCH_TEGRA || ARCH_MULTIPLATFORM
        depends on DRM
+       select TEGRA_HOST1X
        select DRM_KMS_HELPER
 +      select DRM_KMS_FB_HELPER
+       select DRM_PANEL
        select FB_SYS_FILLRECT
        select FB_SYS_COPYAREA
        select FB_SYS_IMAGEBLIT

diff --cc include/drm/drmP.h
Simple merge