Merge branch 'drm-fixes-4.12' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 1 Jun 2017 02:07:18 +0000 (12:07 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 1 Jun 2017 02:07:18 +0000 (12:07 +1000)
* 'drm-fixes-4.12' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: Program ring for vce instance 1 at its register space


Trivial merge