diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-08 13:39:59 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-08 13:39:59 +0200 |
| commit | 5e13a0c5ec05d382b488a691dfb8af015b1dea1e (patch) | |
| tree | 7a06dfa1f7661f8908193f2437b32452520221d3 /arch/sh/include/asm/pgtable-2level.h | |
| parent | drm/i915: Support pageflipping interrupts for all 3-pipes on IVB (diff) | |
| parent | Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel ... (diff) | |
| download | linux-5e13a0c5ec05d382b488a691dfb8af015b1dea1e.tar.xz linux-5e13a0c5ec05d382b488a691dfb8af015b1dea1e.zip | |
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>
Diffstat (limited to 'arch/sh/include/asm/pgtable-2level.h')
0 files changed, 0 insertions, 0 deletions