From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 30 Jan 2014 11:56:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
X-Git-Tag: v3.15-rc1~51^2~62^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e515b47e5646154448e46231d811919d93923da5;p=pandora-kernel.git

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge drm-next - I need to backmerge drm-intel-fixes patches
touching the error capture code to be able to merge Ben's cleanup
patches.

Conflicts:
	drivers/gpu/drm/i915/i915_gpu_error.c

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

e515b47e5646154448e46231d811919d93923da5
Reading git-diff-tree failed