From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 19 Nov 2014 17:14:57 +0000 (+0100)
Subject: Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued
X-Git-Tag: omap-for-v3.19/fixes-rc1~80^2~14^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54499b2a926964b6b671fd03dcdc83c444b8f467;p=pandora-kernel.git

Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued

So with all the code movement and extraction in intel_pm.c in -next
git is hopelessly confused with

commit 2208d655a91f9879bd9a39ff9df05dd668b3512c
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Fri Nov 14 09:25:29 2014 +0100

    drm/i915: drop WaSetupGtModeTdRowDispatch:snb

from -fixes. Worse even small changes in -next move around the
conflict context so rerere is equally useless. Let's just backmerge
and be done with it.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c

Except for git getting lost no tricky conflicts really.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---

54499b2a926964b6b671fd03dcdc83c444b8f467
Reading git-diff-tree failed