tree db610467ee8b6552d2ad784ca1c33b3d8168d753
parent 8e4890fbfb8af675a3800cbbc3463825c372cf78
parent afa4e53a7bcd4328d88e25c7a63746b65dc6bbe2
author Dave Airlie <airlied@redhat.com> 1417146991 +1000
committer Dave Airlie <airlied@redhat.com> 1417146991 +1000

Merge tag 'drm-intel-fixes-2014-11-27' of git://anongit.freedesktop.org/drm-intel into drm-fixes

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