From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 18 Dec 2013 15:23:37 +0000 (+0100)
Subject: Merge commit drm-intel-fixes into topic/ppgtt
X-Git-Tag: v3.15-rc1~51^2~62^2~80^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d7f0f9dcca6b40dd347bbf3508c642002e0a561;p=pandora-kernel.git

Merge commit drm-intel-fixes into topic/ppgtt

I need the tricky do_switch fix before I can merge the final piece of
the ppgtt enabling puzzle. Otherwise the conflict will be a real pain
to resolve since the do_switch hunk from -fixes must be placed at the
exact right place within a hunk in the next patch.

Conflicts:
	drivers/gpu/drm/i915/i915_gem_context.c
	drivers/gpu/drm/i915/i915_gem_execbuffer.c
	drivers/gpu/drm/i915/intel_display.c

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

3d7f0f9dcca6b40dd347bbf3508c642002e0a561
Reading git-diff-tree failed