From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Nov 2012 18:47:55 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: upstream/snapshot3+hdmi~6189
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc19528bd3084c3c2d870b31a3578da8c69952f3;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull DRM fixes from Dave Airlie:
 "Just driver fixes, nothing major, except maybe the Ironlake rc6
  disable:

   - intel:
     * revert ironlake rc6 - we still have one ilk regression, but this
       gets rid of one big one
     * turn off cloning
     * a directed fix for Apple edp
   - radeon: one modesetting fix
   - exynos: minor fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  radeon: fix pll/ctrc mapping on dce2 and dce3 hardware
  Revert "drm/i915: enable rc6 on ilk again"
  drm/i915: do not default to 18 bpp for eDP if missing from VBT
  drm/exynos: Fix potential NULL pointer dereference in exynos_drm_encoder.c
  drm/exynos: Make exynos4/5_fimd_driver_data static
  drm/exynos: fix overlay updating issue
  drm/exynos: remove unnecessary code.
  drm/exynos: fix linux framebuffer address setting.
  drm/i915: disable cloning on sdvo
---

cc19528bd3084c3c2d870b31a3578da8c69952f3