From: Dave Airlie <airlied@gmail.com>
Date: Wed, 19 Sep 2012 09:57:58 +0000 (+1000)
Subject: Merge branch 'drm-lcdc' of git://linuxtv.org/pinchartl/fbdev into drm-next
X-Git-Tag: firefly_0821_release~3680^2~1922^2~17
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f2032d413a2d47089f2b3f8fdd0e344a04de8195;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-lcdc' of git://linuxtv.org/pinchartl/fbdev into drm-next

Laurent writes:

The SH Mobile DRM driver is now (in my opinion) ready for mainline. It
requires GEM and KMS/FB helpers that have been reviewed on the list and
tested. Sascha is waiting for them to reach your tree to send a pull request
for another new driver.

* 'drm-lcdc' of git://linuxtv.org/pinchartl/fbdev:
  drm: Renesas SH Mobile DRM driver
  drm: Add NV24 and NV42 pixel formats
  DRM: Add DRM KMS/FB CMA helper
  DRM: Add DRM GEM CMA helper
  drm/edid: limit printk when facing bad edid
---

f2032d413a2d47089f2b3f8fdd0e344a04de8195