From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 8 May 2012 11:39:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'airlied/drm-core-next' into drm-intel-next-queued
X-Git-Tag: v3.5-rc1~83^2~8^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e13a0c5ec05d382b488a691dfb8af015b1dea1e;p=pandora-kernel.git

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

Backmerge of drm-next to resolve a few ugly conflicts and to get a few
fixes from 3.4-rc6 (which drm-next has already merged). Note that this
merge also restricts the stencil cache lra evict policy workaround to
snb (as it should) - I had to frob the code anyway because the
CM0_MASK_SHIFT define died in the masked bit cleanups.

We need the backmerge to get Paulo Zanoni's infoframe regression fix
for gm45 - further bugfixes from him touch the same area and would
needlessly conflict.

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

5e13a0c5ec05d382b488a691dfb8af015b1dea1e
Reading git-diff-tree failed