Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 27 Sep 2017 19:49:38 +0000 (05:49 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 27 Sep 2017 19:49:38 +0000 (05:49 +1000)
A few fixes for 4.14.  Nothing too major.

* 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: disable hard reset in hibernate for APUs
  drm/amdgpu: revert tile table update for oland


Trivial merge