From: Dave Airlie <airlied@redhat.com>
Date: Fri, 28 Nov 2014 03:56:31 +0000 (+1000)
Subject: Merge tag 'drm-intel-fixes-2014-11-27' of git://anongit.freedesktop.org/drm-intel... 
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~51^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21124e5c52ecf87c3fdcb03855ec852563ce93cf;p=pandora-kernel.git

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
---

21124e5c52ecf87c3fdcb03855ec852563ce93cf
Reading git-diff-tree failed