Merge branch 'drm-fixes-4.17' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 30 May 2018 00:58:31 +0000 (10:58 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 30 May 2018 00:58:31 +0000 (10:58 +1000)
One last fix for 4.17.  Fix a suspend regression in DC.

* 'drm-fixes-4.17' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/display: Fix BUG_ON during CRTC atomic check update


Trivial merge