Merge tag 'drm-intel-fixes-2014-11-27' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 28 Nov 2014 03:56:31 +0000 (13:56 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 28 Nov 2014 03:56:31 +0000 (13:56 +1000)
Two regression fixes from Ville.

* tag 'drm-intel-fixes-2014-11-27' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Cancel vdd off work before suspend
  drm/i915: Ignore SURFLIVE and flip counter when the GPU gets reset


Trivial merge