From: Dave Airlie <airlied@redhat.com>
Date: Thu, 12 Apr 2012 16:42:01 +0000 (+0100)
Subject: Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=173fa4eccc39b04fbc0b569fabac6dbcec33507a;p=linux-beck.git

Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes

* 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung:
  drm/exynos: fixed exynos broken ioctl
  drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv
  drm/exynos: fix struct for operation callback functions to driver name
  drm/exynos: use define instead of default_win member in struct mixer_context
  drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR
  drm/exynos: remove unused codes in hdmi and mixer
  drm/exynos: remove unnecessary type conversion of hdmi and mixer
  drm/exynos: add format list of plane
  drm/exynos: fixed duplicated page allocation bug.
  drm/exynos: fixed page align and code clean.
---

173fa4eccc39b04fbc0b569fabac6dbcec33507a