From: Dave Airlie <airlied@redhat.com>
Date: Wed, 12 Dec 2018 21:25:00 +0000 (+1000)
Subject: Merge tag 'drm-misc-fixes-2018-12-12' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v5.15~7435^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e59166b59aad95d313cfc4cfe32240f1608b33d4;p=platform%2Fkernel%2Flinux-starfive.git

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

- rockchip: Revert change causing WARN on shutdown (Brian)

Cc: Brian Norris <briannorris@chromium.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212204309.GA150523@art_vandelay
---

e59166b59aad95d313cfc4cfe32240f1608b33d4