From: Dave Airlie <airlied@redhat.com>
Date: Thu, 14 Apr 2016 03:06:19 +0000 (+1000)
Subject: Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.6-rc4~12^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ff3e84e8e479c3ba7148f8dc35a56cf091ab56d9;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

fix some exynos regressions.

* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: Use VIDEO_SAMSUNG_S5P_G2D=n as G2D Kconfig dependency
  drm/exynos: fix a warning message
  drm/exynos: mic: fix an error code
  drm/exynos: fimd: fix broken dp_clock control
  drm/exynos: build fbdev code conditionally
  drm/exynos: fix adjusted_mode pointer in exynos_plane_mode_set
  drm/exynos: fix error handling in exynos_drm_subdrv_open
---

ff3e84e8e479c3ba7148f8dc35a56cf091ab56d9