Merge tag 'drm-intel-fixes-2015-06-18' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 19 Jun 2015 01:58:39 +0000 (11:58 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 19 Jun 2015 01:58:39 +0000 (11:58 +1000)
one fix, one revert
* tag 'drm-intel-fixes-2015-06-18' of git://anongit.freedesktop.org/drm-intel:
  Revert "drm/i915: Don't skip request retirement if the active list is empty"
  drm/i915: Always reset vma->ggtt_view.pages cache on unbinding


Trivial merge