tree 5069ee9f240f4897c21e11f9f88b0d5c78bed2a6
parent 72c79bdbda396b7f67e97b2a89410ac91d814c1b
parent bb2551da10b659eab27330483828b88e898e7952
author Linus Torvalds <torvalds@linux-foundation.org> 1331856445 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1331856445 -0700

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

Pull drm exynos/intel updates from Dave Airlie:
 "Two minor updates from Jesse for Intel SNB fixes, and a few fixes from
  Samsung for exynos.  The pull req has Alan's commit in it since Intel
  based their tree on my tree at that time, but it all seems fine wrt
  merging."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm exynos: use drm_fb_helper_set_par directly
  drm/exynos: Fix fb_videomode <-> drm_mode_modeinfo conversion
  drm/exynos: fix runtime_pm fimd device state on probe
  drm/exynos: use correct 'exynos-drm' name for platform device
  drm/i915: support 32 bit BGR formats in sprite planes
  drm/i915: fix color order for BGR formats on SNB
  drm/gma500: Fix Cedarview boot failures in 3.3-rc