From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 21 May 2013 07:52:16 +0000 (+0200)
Subject: Merge tag 'v3.10-rc2' into drm-intel-next-queued
X-Git-Tag: v3.11-rc1~65^2~131^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1b73cba13a0cc68dd4f746eced15bd6bb24cda4;p=pandora-kernel.git

Merge tag 'v3.10-rc2' into drm-intel-next-queued

Backmerge Linux 3.10-rc2 since the various (rather trivial) conflicts
grew a bit out of hand. intel_dp.c has the only real functional
conflict since the logic changed while dev_priv->edp.bpp was moved
around.

Also squash in a whitespace fixup from Ben Widawsky for
i915_gem_gtt.c, git seems to do something pretty strange in there
(which I don't fully understand tbh).

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_dp.c

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

e1b73cba13a0cc68dd4f746eced15bd6bb24cda4
Reading git-diff-tree failed