From: Dave Airlie <airlied@redhat.com>
Date: Wed, 30 May 2018 00:57:57 +0000 (+1000)
Subject: Merge tag 'drm-misc-fixes-2018-05-29' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v4.17~6^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebb442bb35e8c35eb765b04423b28392b4df7a04;p=thirdparty%2Flinux.git

Merge tag 'drm-misc-fixes-2018-05-29' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

core: Add 220us psr setup time (Dhinakaran)
omap: Fix NULL deref (Tomi)

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>

* tag 'drm-misc-fixes-2018-05-29' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/omap: fix NULL deref crash with SDI displays
  drm/psr: Fix missed entry in PSR setup time table.
---

ebb442bb35e8c35eb765b04423b28392b4df7a04