From: Dave Airlie <airlied@redhat.com>
Date: Fri, 24 Jun 2016 03:15:10 +0000 (+1000)
Subject: Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/media into drm-next
X-Git-Tag: v5.15~13124^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6559436d4a45fd42a0f40b8c3a963dd5be585b35;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/media into drm-next

some rcar-du fixes.

* 'drm/next/du' of git://linuxtv.org/pinchartl/media:
  drm: rcar-du: error message is not needed for EPROBE_DEFER
  drm: rcar-du: error message is not needed for drm_vblank_init()
  rcar-du: add/rename DEFR6 TCON bits
---

6559436d4a45fd42a0f40b8c3a963dd5be585b35